Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-42

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 144-147)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 56)

   - Update from CVS

13 files changed, 236 insertions, 39 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 989f803b7fd..bb70c0820a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,32 @@
+2006-03-10  Bill Wohler  <wohler@newt.com>
+
+        * image.el (image-load-path-for-library): Merge at least three
+        functions from Gnus and MH-E into this one function that can now
+        be shared.
+
+2006-03-11  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-remove-text-properties): Rename from
+        gdb-remove-mouse-face and remove help-echo too.
+        (gdb-enqueue-input): Correct conditional clause.
+        
+2006-03-10  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/calendar.el (calendar-holidays): Doc fix.
+        * calendar/holidays.el (list-holidays): Doc fix.
+
+2006-03-10  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdba): Don't call gdb-init-1 explicitly as
+        it gets called in gdb-prompt anyway.
+        (gdb-use-separate-io-buffer): Only restore window arrangement for
+        gdb-many-windows.
+        (gdb-enqueue-input): Make it harder to send GDB input when program
+        is running.
+        (gdb-buffer-list): New variable.
+        (gdb-remove-mouse-face): New function.
+        (gdb-starting): Use it when GDB input won't get sent.
+
 2006-03-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * help.el (view-lossage): Remove trailing whitespace before
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 9516e02c5e1..1383b8bac16 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1192,10 +1192,14 @@ of `general-holidays', `local-holidays' `christian-holidays',
 `oriental-holidays', or `solar-holidays' to nil in your .emacs file,
 you can eliminate unwanted categories of holidays.
 
-Note that these variables are only used to initialize the default
-value of `calendar-holidays'.  In other words, they only have an
-effect on the displayed holidays if set before the calendar is
-loaded.  After the calendar has been loaded, you must customize
+The aforementioned variables control the holiday choices offered
+by the function `list-holidays' when it is called interactively.
+
+They also initialize the default value of `calendar-holidays',
+which is the default list of holidays used by the function
+`list-holidays' in the non-interactive case.  Note that these
+variables have no effect on `calendar-holidays' after it has been
+set (e.g. after the calendar is loaded).  In that case, customize
 `calendar-holidays' directly.
 
 The intention is that (in the US) `local-holidays' be set in
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index c9a1a0f17e5..1aaf226d21d 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -119,8 +119,12 @@ This function is suitable for execution in a .emacs file."
 (defun list-holidays (y1 y2 &optional l label)
   "Display holidays for years Y1 to Y2 (inclusive).
 
-The optional list of holidays L defaults to `calendar-holidays'.  See the
-documentation for that variable for a description of holiday lists.
+The optional list of holidays L defaults to `calendar-holidays'.
+When called interactively, this command offers a choice of
+holidays, based on the variables `solar-holidays' etc.  See the
+documentation of `calendar-holidays' for a list of the variables
+that control the choices, as well as a description of the format
+of a holiday list.
 
 The optional LABEL is used to label the buffer created."
   (interactive
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 374c3da2994..8023af47bfd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,27 @@
+2006-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * smiley.el: Add more test smileys.
+        (smiley-data-directory, smiley-regexp-alist)
+        (gnus-smiley-file-types): Fix doc strings.
+        (smiley-update-cache): Clear smiley-cached-regexp-alist before
+        adding new elements.
+        (smiley-mouse-map): Unused code.  Make it a comment.
+
+2006-03-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-nocem.el (gnus-nocem-scan-groups): Add autoload cookie;
+        scan latest NoCeM messages instead of old ones.
+        (gnus-nocem-check-article): Fix regexps so as to match to PGP
+        delimiters that are recently used.
+        (gnus-nocem-load-cache): Add autoload cookie.
+
+        * gnus.el (gnus-use-nocem): Enable it to be set to also a number.
+
+        * gnus-start.el (gnus-setup-news): Scan NoCeM messages if a group
+        level which is larger than gnus-use-nocem is specified.
+
+        * gnus-group.el (gnus-group-get-new-news): Ditto.
+
 2006-03-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-util.el (gnus-tool-bar-update): New function.
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 3d20af8b0df..0ed72433115 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3622,7 +3622,10 @@ re-scanning.  If ARG is non-nil and not a number, this will force
 
     ;; We might read in new NoCeM messages here.
     (when (and gnus-use-nocem
-               (null arg))
+               (or (and (numberp gnus-use-nocem)
+                        (numberp arg)
+                        (>= arg gnus-use-nocem))
+                   (not arg)))
       (gnus-nocem-scan-groups))
     ;; If ARG is not a number, then we read the active file.
     (when (and arg (not (numberp arg)))
diff --git a/lisp/gnus/gnus-nocem.el b/lisp/gnus/gnus-nocem.el
index b17c33a5d7f..e75b25282b0 100644
--- a/lisp/gnus/gnus-nocem.el
+++ b/lisp/gnus/gnus-nocem.el
@@ -136,6 +136,7 @@ valid issuer, which is much faster if you are selective about the issuers."
             (gnus-sethash group t gnus-nocem-real-group-hashtb))
           gnus-newsrc-alist))
 
+;;;###autoload
 (defun gnus-nocem-scan-groups ()
   "Scan all NoCeM groups for new NoCeM messages."
   (interactive)
@@ -206,10 +207,10 @@ valid issuer, which is much faster if you are selective about the issuers."
                                 (not (member (mail-header-message-id header)
                                              gnus-nocem-seen-message-ids))))
                        (push header check-headers)))
-                (let* ((i 0)
-                       (check-headers
-                        (last check-headers gnus-nocem-check-article-limit))
-                       (len (length check-headers)))
+                (setq check-headers (last (nreverse check-headers)
+                                          gnus-nocem-check-article-limit))
+                (let ((i 0)
+                      (len (length check-headers)))
                   (dolist (h check-headers)
                     (gnus-message
                      7 "Checking article %d in %s for NoCeM (%d of %d)..."
@@ -235,9 +236,13 @@ valid issuer, which is much faster if you are selective about the issuers."
                (days-to-time gnus-nocem-expiry-wait)))
       (gnus-request-article-this-buffer (mail-header-number header) group)
       (goto-char (point-min))
-      (when (re-search-forward "-----BEGIN PGP MESSAGE-----" nil t)
+      (when (re-search-forward
+             "-----BEGIN PGP\\( SIGNED\\)? MESSAGE-----"
+             nil t)
         (delete-region (point-min) (match-beginning 0)))
-      (when (re-search-forward "-----END PGP MESSAGE-----\n?" nil t)
+      (when (re-search-forward
+             "-----END PGP \\(MESSAGE\\|SIGNATURE\\)-----\n?"
+             nil t)
         (delete-region (match-end 0) (point-max)))
       (goto-char (point-min))
       ;; The article has to have proper NoCeM headers.
@@ -334,6 +339,7 @@ valid issuer, which is much faster if you are selective about the issuers."
               gnus-nocem-alist))
       t)))
 
+;;;###autoload
 (defun gnus-nocem-load-cache ()
   "Load the NoCeM cache."
   (interactive)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 6d82d554365..0f56e40ae15 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1049,9 +1049,12 @@ If LEVEL is non-nil, the news will be set up at level LEVEL."
       (gnus-check-bogus-newsgroups))
 
     ;; We might read in new NoCeM messages here.
-    (when (and gnus-use-nocem
-               (not level)
-               (not dont-connect))
+    (when (and (not dont-connect)
+               gnus-use-nocem
+               (or (and (numberp gnus-use-nocem)
+                        (numberp level)
+                        (>= level gnus-use-nocem))
+                   (not level)))
       (gnus-nocem-scan-groups))
 
     ;; Read any slave files.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 2caccc0b70e..7a04c61151a 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1580,9 +1580,23 @@ articles.  This is not a good idea."
                        :value t)))
 
 (defcustom gnus-use-nocem nil
-  "*If non-nil, Gnus will read NoCeM cancel messages."
+  "*If non-nil, Gnus will read NoCeM cancel messages.
+You can also set this variable to a positive number as a group level.
+In that case, Gnus scans NoCeM messages when checking new news if this
+value is not exceeding a group level that you specify as the prefix
+argument to some commands, e.g. `gnus', `gnus-group-get-new-news', etc.
+Otherwise, Gnus does not scan NoCeM messages if you specify a group
+level to those commands."
   :group 'gnus-meta
-  :type 'boolean)
+  :type '(choice
+          (const :tag "off" nil)
+          (const :tag "on" t)
+          (list :convert-widget
+                (lambda (widget)
+                  (list 'integer :tag "group level"
+                        :value (if (boundp 'gnus-level-default-subscribed)
+                                   gnus-level-default-subscribed
+                                 3))))))
 
 (defcustom gnus-suppress-duplicates nil
   "*If non-nil, Gnus will mark duplicate copies of the same article as read."
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index d7657e444b8..e8afe9dd10d 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -31,8 +31,21 @@
 ;; I'm not sure we need that degree of rococoness and defaults like a
 ;; yellow background.  Also, using PBM means we can display the images
 ;; more generally.  -- fx
-
-;;; Test smileys:  :-) :-\ :-( :-/
+;; `smiley.el' was replaced by `smiley-ems.el' on 2002-01-26 (after fx'
+;; comment).
+
+;; Test smileys:
+;; smile             ^:-) ^:)
+;; blink             ;-)  ;)
+;; forced            :-]
+;; braindamaged      8-)
+;; indifferent       :-|
+;; wry               :-/  :-\
+;; sad               :-(
+;; evil              >:-)
+;; cry               ;-(
+;; dead              X-)
+;; grin              :-D
 
 ;;; Code:
 
@@ -45,8 +58,9 @@
   :group 'gnus-visual)
 
 ;; Maybe this should go.
-(defcustom smiley-data-directory (nnheader-find-etc-directory "images/smilies")
-  "*Location of the smiley faces files."
+(defcustom smiley-data-directory
+  (nnheader-find-etc-directory "images/smilies")
+  "Location of the smiley faces files."
   :type 'directory
   :group 'smiley)
 
@@ -61,8 +75,8 @@
     ("\\(:-(\\)\\W" 1 "sad")
     ("\\(:-{\\)\\W" 1 "frown"))
   "*A list of regexps to map smilies to images.
-The elements are (REGEXP MATCH FILE), where MATCH is the submatch in
-regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
+The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
+regexp to replace with IMAGE.  IMAGE is the name of an image file in
 `smiley-data-directory'."
   :type '(repeat (list regexp
                        (integer :tag "Regexp match number")
@@ -78,7 +92,7 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
     (when (gnus-image-type-available-p 'xpm)
       (push "xpm" types))
     types)
-  "*List of suffixes on picon file names to try."
+  "*List of suffixes on smiley file names to try."
   :version "22.1"
   :type '(repeat string)
   :group 'smiley)
@@ -86,6 +100,7 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
 (defvar smiley-cached-regexp-alist nil)
 
 (defun smiley-update-cache ()
+  (setq smiley-cached-regexp-alist nil)
   (dolist (elt (if (symbolp smiley-regexp-alist)
                    (symbol-value smiley-regexp-alist)
                  smiley-regexp-alist))
@@ -104,12 +119,13 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
             (push (list (car elt) (cadr elt) image)
                   smiley-cached-regexp-alist)))))))
 
-(defvar smiley-mouse-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [down-mouse-2] 'ignore) ; override widget
-    (define-key map [mouse-2]
-      'smiley-mouse-toggle-buffer)
-    map))
+;; Not implemented:
+;; (defvar smiley-mouse-map
+;;   (let ((map (make-sparse-keymap)))
+;;     (define-key map [down-mouse-2] 'ignore) ; override widget
+;;     (define-key map [mouse-2]
+;;       'smiley-mouse-toggle-buffer)
+;;     map))
 
 ;;;###autoload
 (defun smiley-region (start end)
diff --git a/lisp/image.el b/lisp/image.el
index 316896cabce..4acff8d251b 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -77,6 +77,80 @@ value is used as a list of directories to search.")
        (list (file-name-as-directory (expand-file-name "images" data-directory))
              'data-directory 'load-path)))
 
+(defun image-load-path-for-library (library image &optional path)
+  "Return a suitable search path for images relative to LIBRARY.
+
+Images for LIBRARY are searched for in \"../../etc/images\" and
+\"../etc/images\" relative to the files in \"lisp/LIBRARY\" as
+well as in `image-load-path' and `load-path'.
+
+This function returns the value of `load-path' augmented with the
+path to IMAGE. If PATH is given, it is used instead of
+`load-path'.
+
+Here is an example that uses a common idiom to provide
+compatibility with versions of Emacs that lack the variable
+`image-load-path':
+
+  (let ((load-path
+         (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\"))
+        (image-load-path
+         (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\" 'image-load-path)))
+    (mh-tool-bar-folder-buttons-init))"
+  (unless library (error "No library specified"))
+  (unless image   (error "No image specified"))
+  (let ((image-directory))
+    (cond
+     ;; Try relative setting.
+     ((let (library-name d1ei d2ei)
+        ;; First, find library in the load-path.
+        (setq library-name (locate-library library))
+        (if (not library-name)
+            (error "Cannot find library %s in load-path" library))
+        ;; And then set image-directory relative to that.
+        (setq
+         ;; Go down 2 levels.
+         d2ei (expand-file-name
+               (concat (file-name-directory library-name) "../../etc/images"))
+         ;; Go down 1 level.
+         d1ei (expand-file-name
+               (concat (file-name-directory library-name) "../etc/images")))
+        (setq image-directory
+              ;; Set it to nil if image is not found.
+              (cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
+                    ((file-exists-p (expand-file-name image d1ei)) d1ei)))))
+     ;; Check for images in image-load-path or load-path.
+     ((let ((img image)
+            (dir (or
+                  ;; Images in image-load-path.
+                  (image-search-load-path image)
+                  ;; Images in load-path.
+                  (locate-library image)))
+            parent)
+        ;; Since the image might be in a nested directory (for
+        ;; example, mail/attach.pbm), adjust `image-directory'
+        ;; accordingly.
+        (and dir
+             (setq dir (file-name-directory dir))
+             (progn
+               (while (setq parent (file-name-directory img))
+                 (setq img (directory-file-name parent)
+                       dir (expand-file-name "../" dir)))
+               (setq image-directory dir)))))
+     (t
+      (error "Could not find image %s for library %s" image library)))
+
+    ;; Return augmented `image-load-path' or `load-path'.
+    (cond ((and path (symbolp path))
+           (nconc (list image-directory)
+                  (delete image-directory
+                          (if (boundp path)
+                              (copy-sequence (symbol-value path))
+                            nil))))
+          (t
+           (nconc (list image-directory)
+                  (delete image-directory (copy-sequence load-path)))))))
+
 (defun image-jpeg-p (data)
   "Value is non-nil if DATA, a string, consists of JFIF image data.
 We accept the tag Exif because that is the same format."
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0a097cb2f02..35a1b1495f1 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el (mh-profile-component): Drop `s' from mhparam
+        -components for Mailutils compatibility (closes SF #1446985).
+
 2006-03-06  Bill Wohler  <wohler@newt.com>
 
         * mh-e.el (Version, mh-version): Add +cvs to version.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 64b625f3ab6..0b8961470a7 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -808,7 +808,9 @@ Currently known variants are 'MH, 'nmh, and 'mu-mh."
 (defun mh-profile-component (component)
   "Return COMPONENT value from mhparam, or nil if unset."
   (save-excursion
-    (mh-exec-cmd-quiet nil "mhparam" "-components" component)
+    ;; MH and nmh use -components, Mailutils uses -component. Since MH
+    ;; and nmh work with an unambiguous prefix, the `s' is dropped here.
+    (mh-exec-cmd-quiet nil "mhparam" "-component" component)
     (mh-profile-component-value component)))
 
 (defun mh-profile-component-value (component)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 4340892a9cc..e3e2e2f23c1 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -257,8 +257,7 @@ detailed description of this mode.
   (interactive (list (gud-query-cmdline 'gdba)))
   ;;
   ;; Let's start with a basic gud-gdb buffer and then modify it a bit.
-  (gdb command-line)
-  (gdb-init-1))
+  (gdb command-line))
 
 (defcustom gdb-debug-ring-max 128
   "Maximum size of `gdb-debug-ring'."
@@ -322,7 +321,7 @@ With arg, use separate IO iff arg is positive."
            (buffer-name gud-comint-buffer))
       (condition-case nil
           (if gdb-use-separate-io-buffer
-              (gdb-restore-windows)
+              (if gdb-many-windows (gdb-restore-windows))
             (kill-buffer (gdb-inferior-io-name)))
         (error nil))))
 
@@ -1037,11 +1036,12 @@ This filter may simply queue input for a later time."
 ;; is a query, or other non-top-level prompt.
 
 (defun gdb-enqueue-input (item)
-  (if gdb-prompting
-      (progn
-        (gdb-send-item item)
+  (if (not gud-running)
+      (if gdb-prompting
+          (progn
+            (gdb-send-item item)
         (setq gdb-prompting nil))
-    (push item gdb-input-queue)))
+        (push item gdb-input-queue))))
 
 (defun gdb-dequeue-input ()
   (let ((queue gdb-input-queue))
@@ -1192,6 +1192,7 @@ not GDB."
      ((eq sink 'user)
       (progn
         (setq gud-running t)
+        (gdb-remove-text-properties)
         (if gdb-use-separate-io-buffer
             (setq gdb-output-sink 'inferior))))
      (t
@@ -1299,6 +1300,18 @@ happens to be appropriate."
       (gdb-resync)
       (error "Phase error in gdb-post-prompt (got %s)" sink)))))
 
+(defconst gdb-buffer-list
+'(gdb-stack-buffer gdb-locals-buffer gdb-registers-buffer gdb-threads-buffer))
+
+(defun gdb-remove-text-properties ()
+  (dolist (buffertype gdb-buffer-list)
+    (let ((buffer (gdb-get-buffer buffertype)))
+      (if buffer
+          (with-current-buffer buffer
+            (let ((inhibit-read-only t))
+              (remove-text-properties
+               (point-min) (point-max) '(mouse-face nil help-echo nil))))))))
+
 ;; GUD displays the selected GDB frame.  This might might not be the current
 ;; GDB frame (after up, down etc).  If no GDB frame is visible but the last
 ;; visited breakpoint is, use that window.