[Emacs-commit] emacs/lisp/mh-e mh-xface.el mh-seq.el mh-acros....

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/02/24 10:09:00

Modified files:
        lisp/mh-e      : mh-xface.el mh-seq.el mh-acros.el ChangeLog 
                         mh-e.el 

Log message:
        Merge from emacs--rel--22
        
        Revision: address@hidden/emacs--devo--0--patch-1074

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-xface.el?cvsroot=emacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-seq.el?cvsroot=emacs&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-acros.el?cvsroot=emacs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/ChangeLog?cvsroot=emacs&r1=1.266&r2=1.267
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-e.el?cvsroot=emacs&r1=1.117&r2=1.118

Patches:
Index: mh-xface.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-xface.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- mh-xface.el 8 Jan 2008 20:46:26 -0000       1.9
+++ mh-xface.el 24 Feb 2008 10:08:59 -0000      1.10
@@ -360,7 +360,7 @@
   "Canonicalize URL.
 Replace the ?/ character with a ?! character and append .png.
 Also replaces special characters with `mh-url-hexify-string'
-since not all characters, such as :, are legal within Windows
+since not all characters, such as :, are valid within Windows
 filenames. In addition, replaces * with %2a. See URL
 
`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'."
   (format "%s/%s.png" mh-x-image-cache-directory

Index: mh-seq.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-seq.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- mh-seq.el   8 Jan 2008 20:46:29 -0000       1.35
+++ mh-seq.el   24 Feb 2008 10:08:59 -0000      1.36
@@ -53,13 +53,13 @@
 
 ;;; Macros
 
-(defmacro mh-make-seq (name msgs)
+(defsubst mh-make-seq (name msgs)
   "Create sequence NAME with the given MSGS."
-  (list 'cons name msgs))
+  (cons name msgs))
 
-(defmacro mh-seq-name (sequence)
+(defsubst mh-seq-name (sequence)
   "Extract sequence name from the given SEQUENCE."
-  (list 'car sequence))
+  (car sequence))
 
 
 

Index: mh-acros.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-acros.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- mh-acros.el 8 Jan 2008 20:46:29 -0000       1.23
+++ mh-acros.el 24 Feb 2008 10:08:59 -0000      1.24
@@ -65,12 +65,14 @@
 ;;;###mh-autoload
 (defmacro mh-do-in-gnu-emacs (&rest body)
   "Execute BODY if in GNU Emacs."
+  (declare (debug t))
   (unless (featurep 'xemacs) `(progn ,@body)))
 (put 'mh-do-in-gnu-emacs 'lisp-indent-hook 'defun)
 
 ;;;###mh-autoload
 (defmacro mh-do-in-xemacs (&rest body)
   "Execute BODY if in XEmacs."
+  (declare (debug t))
   (when (featurep 'xemacs) `(progn ,@body)))
 (put 'mh-do-in-xemacs 'lisp-indent-hook 'defun)
 
@@ -178,6 +180,7 @@
 worry about file locking or the read-only flag, and return its result.
 If SAVE-MODIFICATION-FLAG is non-nil, the buffer's modification flag
 is unchanged, otherwise it is cleared."
+  (declare (debug t))
   (setq save-modification-flag (car save-modification-flag)) ; CL style
   `(prog1
        (let ((mh-folder-updating-mod-flag (buffer-modified-p))
@@ -196,6 +199,7 @@
   "Format is (mh-in-show-buffer (SHOW-BUFFER) &body BODY).
 Display buffer SHOW-BUFFER in other window and execute BODY in it.
 Stronger than `save-excursion', weaker than `save-window-excursion'."
+  (declare (debug t))
   (setq show-buffer (car show-buffer))  ; CL style
   `(let ((mh-in-show-buffer-saved-window (selected-window)))
      (switch-to-buffer-other-window ,show-buffer)
@@ -212,6 +216,7 @@
 After BODY has been executed return to original window. The
 modification flag of the buffer in the event window is
 preserved."
+  (declare (debug t))
   (let ((event-window (make-symbol "event-window"))
         (event-position (make-symbol "event-position"))
         (original-window (make-symbol "original-window"))
@@ -245,9 +250,9 @@
 ;;; Sequences and Ranges
 
 ;;;###mh-autoload
-(defmacro mh-seq-msgs (sequence)
+(defsubst mh-seq-msgs (sequence)
   "Extract messages from the given SEQUENCE."
-  (list 'cdr sequence))
+  (cdr sequence))
 
 ;;;###mh-autoload
 (defmacro mh-iterate-on-messages-in-region (var begin end &rest body)
@@ -257,6 +262,7 @@
 starting from BEGIN till END. In each step BODY is executed.
 
 If VAR is nil then the loop is executed without any binding."
+  (declare (debug (symbolp body)))
   (unless (symbolp var)
     (error "Can not bind the non-symbol %s" var))
   (let ((binding-needed-flag var))
@@ -282,6 +288,7 @@
 The parameter RANGE is usually created with
 `mh-interactive-range' in order to provide a uniform interface to
 MH-E functions."
+  (declare (debug (symbolp body)))
   (unless (symbolp var)
     (error "Can not bind the non-symbol %s" var))
   (let ((binding-needed-flag var)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -b -r1.266 -r1.267
--- ChangeLog   23 Feb 2008 18:36:58 -0000      1.266
+++ ChangeLog   24 Feb 2008 10:09:00 -0000      1.267
@@ -77,6 +77,22 @@
        * mh-mime.el (mh-mml-forward-message): Forward messages as inline
        attatchments (closes SF #1378993).
 
+2008-02-06  Richard Stallman  <address@hidden>
+
+       * mh-seq.el (mh-make-seq, mh-seq-name): Use defsubst.
+
+       * mh-acros.el (mh-do-in-gnu-emacs, mh-do-in-xemacs)
+       (with-mh-folder-updating, mh-in-show-buffer)
+       (mh-iterate-on-messages-in-region, mh-iterate-on-range):
+       (mh-do-at-event-location): Add debug decls.
+       (mh-seq-msgs): Use defsubst.
+
+2008-02-05  Juanma Barranquero  <address@hidden>
+
+       * mh-e.el (mh-scan-format-file-check, mh-adaptive-cmd-note-flag-check):
+       * mh-xface.el (mh-x-image-url-cache-canonicalize):
+       Replace `legal' with `valid'.
+
 2007-08-19  Jeffrey C Honig  <address@hidden>
 
        * mh-e.el (mh-invisible-header-fields-internal): We want to show

Index: mh-e.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-e.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- mh-e.el     18 Feb 2008 22:39:48 -0000      1.117
+++ mh-e.el     24 Feb 2008 10:09:00 -0000      1.118
@@ -1982,7 +1982,7 @@
   :package-version '(MH-E . "7.0"))
 
 (defun mh-scan-format-file-check (symbol value)
-  "Check if desired setting is legal.
+  "Check if desired setting is valid.
 Throw an error if user tries to set `mh-scan-format-file' to
 anything but t when `mh-adaptive-cmd-note-flag' is on. Otherwise,
 set SYMBOL to VALUE."
@@ -2021,7 +2021,7 @@
   :package-version '(MH-E . "6.0"))
 
 (defun mh-adaptive-cmd-note-flag-check (symbol value)
-  "Check if desired setting is legal.
+  "Check if desired setting is valid.
 Throw an error if user tries to turn on
 `mh-adaptive-cmd-note-flag' when `mh-scan-format-file' isn't t.
 Otherwise, set SYMBOL to VALUE."