Merged in changes from CVS HEAD

Patches applied:

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-88

7 files changed, 79 insertions, 43 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf4e852c494..7a1f7e0ec17 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2004-02-20  John Wiegley  <johnw@newartisans.com>
+
+        * eshell/em-pred.el (eshell-modifier-alist): Changed the "eval
+        again" modifier from 'e' to 'E', since 'e' is also used by the
+        "file extension" modifier.
+
+2004-02-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * help-fns.el (describe-categories): Doc fix.
+
+2003-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+        * ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
+        temporary file for buffer already visiting one.  This change makes
+        output likely to be directly usable by patch program.
+        Suggested by Adrian Aichner  <adrian@xemacs.org>
+
+2004-02-20  Nick Roberts  <nick@nick.uklinux.net>
+
+        * gdb-ui.el (gdb-use-colon-colon-notation): Set default to nil for
+        case of variables defined in compound statements.
+        (gdb-setup-windows, gdb-source-info, gdb-source-info): Simplify
+        constructions using switch-to-buffer.
+
 2004-02-19  Simon Josefsson  <jas@extundo.com>
 
         * play/morse.el: Fix typo.
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 9550e65c2e9..79f85cc1896 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -3401,29 +3401,33 @@ Without an argument, it saves customized diff argument, if available
   (let ((buf-A-file-name (buffer-file-name ediff-buffer-A))
         (buf-B-file-name (buffer-file-name ediff-buffer-B))
         file-A file-B)
-    (if (stringp buf-A-file-name)
-        (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
-    (if (stringp buf-B-file-name)
-        (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
-    (setq file-A (ediff-make-temp-file ediff-buffer-A buf-A-file-name)
-          file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name))
-
+    (unless (and buf-A-file-name (file-exists-p buf-A-file-name))
+      (setq file-A
+            (ediff-make-temp-file ediff-buffer-A)))
+    (unless (and buf-B-file-name (file-exists-p buf-B-file-name))
+      (setq file-B
+            (ediff-make-temp-file ediff-buffer-B)))
     (or (ediff-buffer-live-p ediff-custom-diff-buffer)
         (setq ediff-custom-diff-buffer
               (get-buffer-create
                (ediff-unique-buffer-name "*ediff-custom-diff" "*"))))
     (ediff-with-current-buffer ediff-custom-diff-buffer
-      (setq buffer-read-only nil)
-      (erase-buffer))
+                               (setq buffer-read-only nil)
+                               (erase-buffer))
     (ediff-exec-process
      ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
-     ediff-custom-diff-options file-A file-B)
+     ediff-custom-diff-options
+     ;; repetition of buf-A-file-name is needed so it'll return a file
+     (or (and buf-A-file-name (file-exists-p buf-A-file-name) buf-A-file-name)
+         file-A)
+     (or (and buf-B-file-name (file-exists-p buf-B-file-name) buf-B-file-name)
+         file-B))
     ;; put the diff file in diff-mode, if it is available
     (if (fboundp 'diff-mode)
         (with-current-buffer ediff-custom-diff-buffer
           (diff-mode)))
-    (delete-file file-A)
-    (delete-file file-B)
+    (and file-A (file-exists-p file-A) (delete-file file-A))
+    (and file-B (file-exists-p file-B) (delete-file file-B))
     ))
 
 (defun ediff-show-diff-output (arg)
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 3be32fde10d..26349b4e94b 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -113,7 +113,7 @@ The format of each entry is
 (put 'eshell-predicate-alist 'risky-local-variable t)
 
 (defcustom eshell-modifier-alist
-  '((?e . '(lambda (lst)
+  '((?E . '(lambda (lst)
              (mapcar
               (function
                (lambda (str)
@@ -207,7 +207,7 @@ EXAMPLES:
   "Eshell modifier quick reference:
 
 FOR SINGLE ARGUMENTS, or each argument of a list of strings:
-  e  evaluate again
+  E  evaluate again
   L  lowercase
   U  uppercase
   C  capitalize
diff --git a/lisp/gdb-ui.el b/lisp/gdb-ui.el
index 6e469427e73..60ac57dd10f 100644
--- a/lisp/gdb-ui.el
+++ b/lisp/gdb-ui.el
@@ -179,7 +179,7 @@ The following interactive lisp functions help control operation :
   ;;
   (run-hooks 'gdba-mode-hook))
 
-(defcustom gdb-use-colon-colon-notation t
+(defcustom gdb-use-colon-colon-notation nil
   "Non-nil means use FUNCTION::VARIABLE format to display variables in the
 speedbar."
   :type 'boolean
@@ -1622,13 +1622,13 @@ the source buffer."
   (other-window 1)
   (switch-to-buffer (gdb-locals-buffer-name))
   (other-window 1)
-  (if (and gdb-view-source
-           (eq gdb-selected-view 'source))
-      (switch-to-buffer
+  (switch-to-buffer
+   (if (and gdb-view-source
+            (eq gdb-selected-view 'source))
        (if gud-last-last-frame
            (gud-find-file (car gud-last-last-frame))
-         (gud-find-file gdb-main-file)))
-    (switch-to-buffer (gdb-get-create-buffer 'gdb-assembler-buffer)))
+         (gud-find-file gdb-main-file))
+     (gdb-get-create-buffer 'gdb-assembler-buffer)))
   (setq gdb-source-window (get-buffer-window (current-buffer)))
   (split-window-horizontally)
   (other-window 1)
@@ -1668,13 +1668,13 @@ This arrangement depends on the value of `gdb-many-windows'."
     (delete-other-windows)
     (split-window)
     (other-window 1)
-    (if (and gdb-view-source
-           (eq gdb-selected-view 'source))
-        (switch-to-buffer
+    (switch-to-buffer
+     (if (and gdb-view-source
+              (eq gdb-selected-view 'source))
          (if gud-last-last-frame
              (gud-find-file (car gud-last-last-frame))
-           (gud-find-file gdb-main-file)))
-      (switch-to-buffer (gdb-get-create-buffer 'gdb-assembler-buffer)))
+           (gud-find-file gdb-main-file))
+       (gdb-get-create-buffer 'gdb-assembler-buffer)))
     (setq gdb-source-window (get-buffer-window (current-buffer)))
     (other-window 1)))
 
@@ -1721,12 +1721,10 @@ buffers."
     (delete-other-windows)
     (split-window)
     (other-window 1)
-    (if gdb-view-source
-      (switch-to-buffer
-       (if gud-last-last-frame
-           (gud-find-file (car gud-last-last-frame))
-         (gud-find-file gdb-main-file)))
-      (switch-to-buffer (gdb-get-create-buffer 'gdb-assembler-buffer)))
+    (switch-to-buffer
+     (if gdb-view-source
+         (gud-find-file gdb-main-file)
+       (gdb-get-create-buffer 'gdb-assembler-buffer)))
     (setq gdb-source-window (get-buffer-window (current-buffer)))
     (other-window 1)))
 
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 9769d613cbc..4201a3de1a5 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -544,7 +544,9 @@ BUFFER defaults to the current buffer."
 ;;;###autoload
 (defun describe-categories (&optional buffer)
   "Describe the category specifications in the current category table.
-The descriptions are inserted in a buffer, which is then displayed."
+The descriptions are inserted in a buffer, which is then displayed.
+If BUFFER is non-nil, then describe BUFFER's category table instead.
+BUFFER should be a buffer or a buffer name."
   (interactive)
   (setq buffer (or buffer (current-buffer)))
   (help-setup-xref (list #'describe-categories buffer) (interactive-p))
diff --git a/src/ChangeLog b/src/ChangeLog
index 58661af0867..a25239d88a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * category.c (Fdefine_category, Fcategory_docstring)
+        (Fget_unused_category, Fset_category_table)
+        (Fcategory_set_mnemonics): Doc fixes.
+
 2004-02-20  Kim F. Storm  <storm@cua.dk>
 
         * keyboard.c: Undo 2004-02-16 and 2004-02-17 changes.
@@ -7,7 +13,7 @@
         (read_avail_input): Separate and rework handling of read_socket_hook
         and non-read_socket_hook cases.  Use smaller input_event buffer
         in read_socket_hook case, and repeat if full buffer is read.  Use
-        new local variable 'discard' to skip input after C-g. 
+        new local variable 'discard' to skip input after C-g.
         In non-read_socket_hook case, just use a single input_event, and
         call kbd_buffer_store_event on the fly for each character.
 
diff --git a/src/category.c b/src/category.c
index 223ec20cd73..b7eadd0e771 100644
--- a/src/category.c
+++ b/src/category.c
@@ -87,11 +87,11 @@ those categories.  */)
 Lisp_Object check_category_table ();
 
 DEFUN ("define-category", Fdefine_category, Sdefine_category, 2, 3, 0,
-       doc: /* Define CHAR as a category which is described by DOCSTRING.
-CHAR should be an ASCII printing character in the range ` ' to `~'.
-DOCSTRING is a documentation string of the category.
+       doc: /* Define CATEGORY as a category which is described by DOCSTRING.
+CATEGORY should be an ASCII printing character in the range ` ' to `~'.
+DOCSTRING is the documentation string of the category.
 The category is defined only in category table TABLE, which defaults to
- the current buffer's category table.  */)
+the current buffer's category table.  */)
      (category, docstring, table)
      Lisp_Object category, docstring, table;
 {
@@ -107,7 +107,9 @@ The category is defined only in category table TABLE, which defaults to
 }
 
 DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0,
-       doc: /* Return the documentation string of CATEGORY, as defined in CATEGORY-TABLE.  */)
+       doc: /* Return the documentation string of CATEGORY, as defined in TABLE.
+TABLE should be a category table and defaults to the current buffer's
+category table.  */)
      (category, table)
      Lisp_Object category, table;
 {
@@ -119,10 +121,9 @@ DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0,
 
 DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category,
        0, 1, 0,
-       doc: /* Return a category which is not yet defined in CATEGORY-TABLE.
+       doc: /* Return a category which is not yet defined in TABLE.
 If no category remains available, return nil.
-The optional argument CATEGORY-TABLE
-specifies which category table to modify;
+The optional argument TABLE specifies which category table to modify;
 it defaults to the current buffer's category table.  */)
      (table)
      Lisp_Object table;
@@ -267,7 +268,8 @@ DEFUN ("make-category-table", Fmake_category_table, Smake_category_table,
 }
 
 DEFUN ("set-category-table", Fset_category_table, Sset_category_table, 1, 1, 0,
-       doc: /* Specify TABLE as the category table for the current buffer.  */)
+       doc: /* Specify TABLE as the category table for the current buffer.
+Return TABLE.  */)
      (table)
      Lisp_Object table;
 {
@@ -294,7 +296,7 @@ DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics,
        Scategory_set_mnemonics, 1, 1, 0,
        doc: /* Return a string containing mnemonics of the categories in CATEGORY-SET.
 CATEGORY-SET is a bool-vector, and the categories \"in\" it are those
-that are indexes where t occurs the bool-vector.
+that are indexes where t occurs in the bool-vector.
 The return value is a string containing those same categories.  */)
      (category_set)
      Lisp_Object category_set;