Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-219
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-139
This commit is contained in:
Karoly Lorentey 2004-04-16 13:36:07 +00:00
commit 5ffa0039d4
13 changed files with 179 additions and 80 deletions

48
configure vendored
View file

@ -4193,6 +4193,54 @@ then
fi
late_LDFLAGS=$LDFLAGS
if test $GCC = yes; then
LDFLAGS="$LDFLAGS -Wl,-znocombreloc"
else
LDFLAGS="$LDFLAGS -znocombreloc"
fi
echo "$as_me:$LINENO: checking For -znocombreloc" >&5
echo $ECHO_N "checking For -znocombreloc... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
main(){return 0;}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
LDFLAGS=$late_LDFLAGS
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
echo "$as_me:$LINENO: checking for egrep" >&5
echo $ECHO_N "checking for egrep... $ECHO_C" >&6

View file

@ -1604,13 +1604,19 @@ candidate is a directory.
to the text before point. If there is text in the buffer after point,
it remains unchanged.
** Visual feedback of *Completions* buffer is enhanced.
Faces are put on the common prefix substrings and the first uncommon
charachters of each completion candidate in the *Completions* buffer.
`completion-de-emphasis' is put on the common prefix substrings as the
face; and `completion-emphasis' is put on the first uncommon
charachters. By default `completion-de-emphasis' is inherited from
`default' face. `completion-emphasis' is inherited from `bold' face.
** Enhanced visual feedback in *Completions* buffer.
Completions lists use faces to highlight what all completions
have in common and where they begin to differ.
The common prefix shared by all possible completions uses the face
`completions-common-part', while the first character that isn't the
same uses the face `completions-first-difference'. By default,
`completions-common-part' inherits from `default', and
`completions-first-difference' inherits from `bold'. The idea of
`completions-common-part' is that you can use it to make the common
parts less visible than normal, so that the rest of the differing
parts is, by contrast, slightly highlighted.
+++
** New user option `inhibit-startup-buffer-menu'.

View file

@ -1,3 +1,31 @@
2004-04-16 Andre Spiegel <spiegel@gnu.org>
* vc-hooks.el (vc-default-workfile-unchanged-p): Quote signal.
* vc.el (vc-print-log): Likewise.
2004-04-16 Masatake YAMATO <jet@gyve.org>
* simple.el (completion-setup-function): Set an initial value
to `element-common-end' before entering loop. Set a value
to `element-common-end' at the end of loop.
The bug is reported by Juri Linkov <juri@jurta.org> in emacs-devel
list.
(completions-common-part): Rename from completion-de-emphasis.
(completions-first-difference): Rename from completion-emphasis.
Suggested by RMS.
2004-04-16 Juanma Barranquero <lektu@terra.es>
* bookmark.el (bookmark-send-edited-annotation): Fix docstring.
(bookmark-edit-annotation-mode): Add mode name.
2004-04-15 Nick Roberts <nick@nick.uklinux.net>
* progmodes/gdb-ui.el (gdb-goto-info): New function.
* progmodes/gud.el (gud-menu-map, gud-tool-bar-map): Add help button.
2004-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/bytecomp.el (batch-byte-compile-file):
@ -288,7 +316,7 @@
2004-04-08 Nick Roberts <nick@nick.uklinux.net>
* progmodes/gdb-ui.el (gdb-source-window): Remove variable
* progmodes/gdb-ui.el (gdb-source-window): Remove variable.
(gdb-goto-breakpoint, gdb-display-buffer)
(gdb-display-source-buffer, gdb-view-source-function)
(gdb-view-assembler, gdb-setup-windows, gdb-restore-windows)
@ -375,19 +403,6 @@
* help-mode.el (help-function-def, help-variable-def): Handle hyperrefs
to C source files specially.
2004-04-07 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/compile.el: Require CL.
(compilation-mode-font-lock-keywords): Re-install the "line as
function" patch.
* help-fns.el (help-C-source-directory): New var.
(help-subr-name, help-C-file-name, help-find-C-source): New funs.
(describe-function-1, describe-variable): Use them.
* help-mode.el (help-function-def, help-variable-def): Handle hyperrefs
to C source files specially.
2004-04-07 Jan Nieuwenhuizen <janneke@gnu.org>
* info.el (Info-hide-cookies-node): New function.
@ -667,7 +682,7 @@
* progmodes/gdb-ui.el (gdb-ann3, gdb-send-item)
(gud-gdba-marker-filter): Log the process input and output, if
required. (from Stefan Monnier)
required. From Stefan Monnier.
(gdb-debug-log, gdb-enable-debug-log): New variables.
(gdb-post-prompt): Don't do gdb-var-update on Mac OS X.
@ -1505,7 +1520,7 @@
* printing.el: Replace "As Is..." in PostScript file print/preview by
"No Preprocessing...". Suggested by Colin Marquardt
<marquardt@zmd.de>.
<_marquardt_@zmd.de>.
(pr-insert-section-4): Adjust buffer interface.
2004-02-29 Kai Grossjohann <kai.grossjohann@gmx.net>

View file

@ -893,7 +893,8 @@ When you have finished composing, type \\[bookmark-send-annotation].
(make-local-variable 'bookmark-annotation-name)
(setq bookmark-annotation-name bookmark)
(use-local-map bookmark-edit-annotation-mode-map)
(setq major-mode 'bookmark-edit-annotation-mode)
(setq major-mode 'bookmark-edit-annotation-mode
mode-name "Edit Bookmark Annotation")
(insert (funcall bookmark-read-annotation-text-func bookmark))
(let ((annotation (bookmark-get-annotation bookmark)))
(if (and annotation (not (string-equal annotation "")))
@ -902,7 +903,8 @@ When you have finished composing, type \\[bookmark-send-annotation].
(defun bookmark-send-edited-annotation ()
"Use buffer contents (minus beginning with `#' as annotation for a bookmark."
"Use buffer contents as annotation for a bookmark.
Lines beginning with `#' are ignored."
(interactive)
(if (not (eq major-mode 'bookmark-edit-annotation-mode))
(error "Not in bookmark-edit-annotation-mode"))

View file

@ -75,21 +75,32 @@ pops up the GUD buffer unless `gdb-show-main' is t. In this case
it starts with two windows: one displaying the GUD buffer and the
other with the source file with the main routine of the debugee.
If `gdb-many-windows' is t the layout below will appear
regardless of the value of `gdb-show-main' unless
If `gdb-many-windows' is t, regardless of the value of
`gdb-show-main', the layout below will appear unless
`gdb-use-inferior-io-buffer' is nil when the source buffer
occupies the full width of the frame. Keybindings are given in
relevant buffer.
Watch expressions appear in the speedbar/slowbar.
The following interactive lisp functions help control operation :
`gdb-many-windows' - Toggle the number of windows gdb uses.
`gdb-restore-windows' - To restore the window layout.
See Info node `(emacs)GDB Graphical Interface' for a more
detailed description of this mode.
---------------------------------------------------------------------
GDB Toolbar
---------------------------------------------------------------------
GUD buffer (I/O of GDB) | Locals buffer
GUD buffer (I/O of GDB) | Locals buffer
|
|
|
---------------------------------------------------------------------
Source buffer | Input/Output (of debugee) buffer
Source buffer | Input/Output (of debugee) buffer
| (comint-mode)
|
|
@ -98,28 +109,12 @@ Source buffer | Input/Output (of debugee) buffer
|
|
---------------------------------------------------------------------
Stack buffer | Breakpoints buffer
Stack buffer | Breakpoints buffer
RET gdb-frames-select | SPC gdb-toggle-breakpoint
| RET gdb-goto-breakpoint
| d gdb-delete-breakpoint
---------------------------------------------------------------------
All the buffers share the toolbar and source should always display in the same
window e.g after typing g on a breakpoint in the breakpoints buffer. Breakpoint
icons are displayed both by setting a break with gud-break and by typing break
in the GUD buffer.
This works best (depending on the size of your monitor) using most of the
screen.
Displayed expressions appear in separate frames. Arrays may be displayed
as slices and visualised using the graph program from plotutils if installed.
Pointers in structures may be followed in a tree-like fashion.
The following interactive lisp functions help control operation :
`gdb-many-windows' - Toggle the number of windows gdb uses.
`gdb-restore-windows' - To restore the window layout."
"
;;
(interactive (list (gud-query-cmdline 'gdba)))
;;
@ -224,6 +219,11 @@ speedbar."
`(lambda () (gdb-var-create-handler ,expr))))))
(select-window (get-buffer-window gud-comint-buffer)))
(defun gdb-goto-info ()
(interactive)
(select-frame (make-frame))
(Info-goto-node "(emacs)GDB Graphical Interface"))
(defconst gdb-var-create-regexp
"name=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",type=\"\\(.*?\\)\"")
@ -1656,7 +1656,7 @@ the source buffer."
(other-window 1))
(defcustom gdb-many-windows nil
"Nil (the default value) means just pops up the GUD buffer
"Nil (the default value) means just pop up the GUD buffer
unless `gdb-show-main' is t. In this case it starts with two
windows: one displaying the GUD buffer and the other with the
source file with the main routine of the debugee. Non-nil means

View file

@ -92,7 +92,9 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist."
Used to grey out relevant toolbar icons.")
(easy-mmode-defmap gud-menu-map
'(([refresh] "Refresh" . gud-refresh)
'(([help] menu-item "Help" gdb-goto-info
:enable (eq gud-minor-mode 'gdba))
([refresh] "Refresh" . gud-refresh)
([run] menu-item "Run" gud-run
:enable (and (not gud-running)
(memq gud-minor-mode '(gdba gdb dbx jdb))))
@ -116,20 +118,17 @@ Used to grey out relevant toolbar icons.")
([print] menu-item "Print Expression" gud-print
:enable (not gud-running))
([watch] menu-item "Watch Expression" gud-watch
:enable (and (not gud-running)
(eq gud-minor-mode 'gdba)))
:enable (and (not gud-running) (eq gud-minor-mode 'gdba)))
([finish] menu-item "Finish Function" gud-finish
:enable (and (not gud-running)
(memq gud-minor-mode
'(gdba gdb xdb jdb pdb bashdb))))
([stepi] menu-item "Step Instruction" gud-stepi
:enable (and (not gud-running)
(memq gud-minor-mode
'(gdba gdb dbx))))
(memq gud-minor-mode '(gdba gdb dbx))))
([nexti] menu-item "Next Instruction" gud-nexti
:enable (and (not gud-running)
(memq gud-minor-mode
'(gdba gdb dbx))))
(memq gud-minor-mode '(gdba gdb dbx))))
([step] menu-item "Step Line" gud-step
:enable (not gud-running))
([next] menu-item "Next Line" gud-next
@ -171,7 +170,8 @@ Used to grey out relevant toolbar icons.")
(gud-stepi . "gud-si")
(gud-nexti . "gud-ni")
(gud-up . "gud-up")
(gud-down . "gud-down"))
(gud-down . "gud-down")
(gdb-goto-info . "help"))
map)
(tool-bar-local-item-from-menu
(car x) (cdr x) map gud-minor-mode-map)))))

View file

@ -987,7 +987,7 @@ as an argument limits undo to changes within the current region."
(undo-start))
;; get rid of initial undo boundary
(undo-more 1))
;; If we got this far, the next command should be a consecutive undo.
;; If we got this far, the next command should be a consecutive undo.
(setq this-command 'undo)
;; Check to see whether we're hitting a redo record, and if
;; so, ask the user whether she wants to skip the redo/undo pair.
@ -4120,12 +4120,12 @@ The completion list buffer is available as the value of `standard-output'.")
;; This function goes in completion-setup-hook, so that it is called
;; after the text of the completion list buffer is written.
(defface completion-emphasis
(defface completions-first-difference
'((t (:inherit bold)))
"Face put on the first uncommon character in completions in *Completions* buffer."
:group 'completion)
(defface completion-de-emphasis
(defface completions-common-part
'((t (:inherit default)))
"Face put on the common prefix substring in completions in *Completions* buffer."
:group 'completion)
@ -4158,26 +4158,28 @@ The completion list buffer is available as the value of `standard-output'.")
(save-match-data
(if (minibufferp mainbuf)
(setq completion-base-size 0))))
;; Put emphasis and de-emphasis faces on completions.
;; Put faces on first uncommon characters and common parts.
(when completion-base-size
(let ((common-string-length (length
(substring mbuf-contents
completion-base-size)))
(element-start (next-single-property-change
(point-min)
'mouse-face))
element-common-end)
(while element-start
(setq element-common-end (+ element-start common-string-length))
(let* ((common-string-length (length
(substring mbuf-contents
completion-base-size)))
(element-start (next-single-property-change
(point-min)
'mouse-face))
(element-common-end (+ element-start common-string-length))
(maxp (point-max)))
(while (and element-start (< element-common-end maxp))
(when (and (get-char-property element-start 'mouse-face)
(get-char-property element-common-end 'mouse-face))
(put-text-property element-start element-common-end
'font-lock-face 'completion-de-emphasis)
'font-lock-face 'completions-common-part)
(put-text-property element-common-end (1+ element-common-end)
'font-lock-face 'completion-emphasis))
(setq element-start (next-single-property-change
'font-lock-face 'completions-first-difference))
(setq element-start (next-single-property-change
element-start
'mouse-face)))))
'mouse-face))
(if element-start
(setq element-common-end (+ element-start common-string-length))))))
;; Insert help string.
(goto-char (point-min))
(if (display-mouse-p)

View file

@ -477,6 +477,13 @@ An error is raised if not inside a conflict."
;; handle the various conflict styles
(cond
((save-excursion
(goto-char mine-start)
(re-search-forward smerge-begin-re end t))
;; There's a nested conflict and we're after the the beginning
;; of the outer one but before the beginning of the inner one.
(error "There is a nested conflict"))
((re-search-backward smerge-base-re start t)
;; a 3-parts conflict
(set (make-local-variable 'smerge-conflict-style) 'diff3-A)
@ -521,9 +528,11 @@ The submatches are the same as in `smerge-match-conflict'.
Returns non-nil if a match is found between the point and LIMIT.
The point is moved to the end of the conflict."
(when (re-search-forward smerge-begin-re limit t)
(ignore-errors
(smerge-match-conflict)
(goto-char (match-end 0)))))
(condition-case err
(progn
(smerge-match-conflict)
(goto-char (match-end 0)))
(error (smerge-find-conflict limit)))))
(defun smerge-diff (n1 n2)
(smerge-match-conflict)
@ -673,5 +682,5 @@ buffer names."
(provide 'smerge-mode)
;;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
;;; smerge-mode.el ends here

View file

@ -475,7 +475,7 @@ Return non-nil if FILE is unchanged."
(vc-find-backend-function (vc-backend file)
'diff))))
(not (eq (caddr err) 5)))
(signal wrong-number-of-arguments err)
(signal 'wrong-number-of-arguments err)
(vc-call diff file))))))
(defun vc-workfile-version (file)

View file

@ -2361,7 +2361,7 @@ If FOCUS-REV is non-nil, leave the point at that revision."
(vc-find-backend-function (vc-backend file)
'print-log))))
(not (eq (caddr err) 2)))
(signal wrong-number-of-arguments err)
(signal 'wrong-number-of-arguments err)
;; for backward compatibility
(vc-call print-log file)
(set-buffer "*vc*"))))

View file

@ -1,3 +1,7 @@
2004-04-15 Kim F. Storm <storm@cua.dk>
* cmdargs.texi (Initial Options): Add -Q.
2004-04-05 Kim F. Storm <storm@cua.dk>
* custom.texi (File Variables): Add safe-local-eval-forms.

View file

@ -259,6 +259,13 @@ Do not load @file{site-start.el}. The options @samp{-q}, @samp{-u}
and @samp{--batch} have no effect on the loading of this file---this is
the only option that blocks it.
@item -Q
@opindex -Q
Start emacs with minimum customizations and window decorations.
This is like using @samp{-q} and @samp{--no-site-file}, but in
addition it also disables the menu-bar, the tool-bar, the scroll-bars,
tool tips, the blinking cursor, and the fancy startup screen.
@item --no-splash
@opindex --no-splash
@vindex inhibit-startup-message

View file

@ -914,7 +914,13 @@ Elements of the attribute list are:
call the corresponding file handler. */
handler = Ffind_file_name_handler (filename, Qfile_attributes);
if (!NILP (handler))
return call3 (handler, Qfile_attributes, filename, id_format);
{ /* Only pass the extra arg if it is used to help backward compatibility
with old file handlers which do not implement the new arg. --Stef */
if (NILP (id_format))
return call2 (handler, Qfile_attributes, filename);
else
return call3 (handler, Qfile_attributes, filename, id_format);
}
encoded = ENCODE_FILE (filename);