merge emacs-23

11 files changed, 95 insertions, 24 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65b4ec8d400..dd29de7e783 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,34 @@
         * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
         header components.
 
+2011-02-19  Kenichi Handa  <handa@m17n.org>
+
+        * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to
+        get the header copy into the temporary buffer.
+        (rmail-mime-insert-decoded-text): Ignore us-ascii.
+        (rmail-show-mime): When rmail-mime-coding-system is nil, set
+        buffer-file-coding-system to undecided.
+
+2011-02-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * image-mode.el (image-toggle-display-image): Disable
+        require-final-newline in buffers visiting binary image files.
+        (Bug#8047)
+
+        * international/mule-cmds.el (read-char-by-name, ucs-insert):
+        Document completion with asterisk and a substring.
+
+2011-02-18  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (find-file-literally): Doc fix.
+
+2011-02-17  Glenn Morris  <rgm@gnu.org>
+
+        * simple.el (rfc822-goto-eoh): Give it a doc-string.
+
+        * log-edit.el (log-edit-insert-changelog):
+        Fix `log-edit-strip-single-file-name' functionality.  (Bug#8057)
+
 2011-02-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * pgg-gpg.el (pgg-gpg-process-region): Bind
diff --git a/lisp/files.el b/lisp/files.el
index b026bf3352f..88063aed2b9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2008,7 +2008,8 @@ Don't call it from programs!  Use `insert-file-contents-literally' instead.
 
 (defvar find-file-literally nil
   "Non-nil if this buffer was made by `find-file-literally' or equivalent.
-This is a permanent local.")
+This has the `permanent-local' property, which takes effect if you
+make the variable buffer-local.")
 (put 'find-file-literally 'permanent-local t)
 
 (defun find-file-literally (filename)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index eecbe978c29..1b2ef3e167e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-18  Glenn Morris  <rgm@gnu.org>
+
+        * gnus.el (gnus-meta): Doc fix.
+
+2011-02-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update,
+        in case it's not yet loaded.
+
 2011-01-13  Chong Yidong  <cyd@stupidchicken.com>
 
         * message.el (message-bury): Add special-case handling for Rmail.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index a5140542fcc..5180673386c 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -275,7 +275,7 @@
 
 (defgroup gnus-meta nil
   "Meta variables controlling major portions of Gnus.
-In general, modifying these variables does not take affect until Gnus
+In general, modifying these variables does not take effect until Gnus
 is restarted, and sometimes reloaded."
   :group 'gnus)
 
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index a93f0913e42..d90e836e246 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -1099,8 +1099,8 @@ This command does not work if you use short group names."
     (gnus-make-directory (file-name-directory (buffer-file-name)))
     (let ((coding-system-for-write
            (or nnfolder-file-coding-system-for-write
-               nnfolder-file-coding-system))
-          (copyright-update nil))
+               nnfolder-file-coding-system)))
+      (set (make-local-variable 'copyright-update) nil)
       (save-buffer)))
   (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)
     (nnfolder-save-nov)))
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index b30a43080d6..191e347330d 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -507,6 +507,11 @@ was inserted."
     ;; This just makes the arrow displayed in the right fringe
     ;; area look correct when the image is wider than the window.
     (setq truncate-lines t)
+    ;; Disable adding a newline at the end of the image file when it
+    ;; is written with, e.g., C-x C-w.
+    (if (coding-system-equal (coding-system-base buffer-file-coding-system)
+                             'no-conversion)
+        (set (make-local-variable 'require-final-newline) nil))
     ;; Allow navigation of large images
     (set (make-local-variable 'auto-hscroll-mode) nil)
     (setq image-type type)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index fed7e6ec9b1..0ca4a740586 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2934,11 +2934,19 @@ on encoding."
 (defun read-char-by-name (prompt)
   "Read a character by its Unicode name or hex number string.
 Display PROMPT and read a string that represents a character by its
-Unicode property `name' or `old-name'.  You can type a few of first
-letters of the Unicode name and use completion.  This function also
-accepts a hexadecimal number of Unicode code point or a number in
-hash notation, e.g. #o21430 for octal, #x2318 for hex, or #10r8984
-for decimal.  Returns a character as a number."
+Unicode property `name' or `old-name'.
+
+This function returns the character as a number.
+
+You can type a few of the first letters of the Unicode name and
+use completion.  If you type a substring of the Unicode name
+preceded by an asterisk `*' and use completion, it will show all
+the characters whose names include that substring, not necessarily
+at the beginning of the name.
+
+This function also accepts a hexadecimal number of Unicode code
+point or a number in hash notation, e.g. #o21430 for octal,
+#x2318 for hex, or #10r8984 for decimal."
   (let* ((completion-ignore-case t)
          (input (completing-read prompt ucs-completions)))
     (cond
@@ -2953,6 +2961,13 @@ for decimal.  Returns a character as a number."
   "Insert COUNT copies of CHARACTER of the given Unicode code point.
 Interactively, prompts for a Unicode character name or a hex number
 using `read-char-by-name'.
+
+You can type a few of the first letters of the Unicode name and
+use completion.  If you type a substring of the Unicode name
+preceded by an asterisk `*' and use completion, it will show all
+the characters whose names include that substring, not necessarily
+at the beginning of the name.
+
 The optional third arg INHERIT (non-nil when called interactively),
 says to inherit text properties from adjoining text, if those
 properties are sticky."
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 865b1f31818..373cc31e0cd 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -621,14 +621,18 @@ regardless of user name or time."
           (delete-region start end)
           (rfc822-goto-eoh)
           (insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n")))))
-    (goto-char (point-min))
-    (when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+"))
-      (forward-line 1)
-      (when (not (re-search-forward "^\\*\\s-+" nil t))
-        (goto-char (point-min))
-        (skip-chars-forward "^():")
-        (skip-chars-forward ": ")
-        (delete-region (point-min) (point))))))
+    (and log-edit-strip-single-file-name
+         (progn (rfc822-goto-eoh)
+                (if (looking-at "\n") (forward-char 1))
+                (looking-at "\\*\\s-+"))
+         (let ((start (point)))
+           (forward-line 1)
+           (when (not (re-search-forward "^\\*\\s-+" nil t))
+             (goto-char start)
+             (skip-chars-forward "^():")
+             (skip-chars-forward ": ")
+             (delete-region start (point)))))
+    (goto-char (point-min))))
 
 ;;;;
 ;;;; functions for getting commit message from ChangeLog a file...
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 94f5ce45054..5e9baed1c2e 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4297,7 +4297,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "7f6ad821b4543a18139fee9250beea5c")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9c0902449733cabd5c7e7d17092a7c69")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index d6af925d461..e44dd877e4f 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -471,10 +471,11 @@ See `rmail-mime-entity' for the detail."
 HEADER is a header component of a MIME-entity object (see
 `rmail-mime-entity')."
   (with-temp-buffer
-    (let ((last-coding-system-used nil))
+    (let ((buf (current-buffer)))
       (with-current-buffer rmail-mime-mbox-buffer
-        (let ((rmail-buffer rmail-mime-mbox-buffer)
-              (rmail-view-buffer rmail-mime-view-buffer))
+        (let ((last-coding-system-used nil)
+              (rmail-buffer rmail-mime-mbox-buffer)
+              (rmail-view-buffer buf))
           (save-excursion
             (goto-char (aref header 0))
             (rmail-copy-headers (point) (aref header 1)))))
@@ -513,7 +514,9 @@ HEADER is a header component of a MIME-entity object (see
               ((string= transfer-encoding "quoted-printable")
                (quoted-printable-decode-region pos (point))))))
     (decode-coding-region pos (point) coding-system)
-    (if (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system))
+    (if (and
+         (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system))
+         (not (eq (coding-system-base coding-system) 'us-ascii)))
         (setq rmail-mime-coding-system coding-system))
     (or (bolp) (insert "\n"))))
 
@@ -1301,7 +1304,10 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
                       (rmail-mime-find-header-encoding
                        (rmail-mime-entity-header entity)))))
           (set-buffer-file-coding-system
-           (coding-system-base rmail-mime-coding-system) t t))
+           (if rmail-mime-coding-system
+               (coding-system-base rmail-mime-coding-system)
+             'undecided)
+           t t))
       ;; Decoding failed.  ENTITY is an error message.  Insert the
       ;; original message body as is, and show warning.
       (let ((region (with-current-buffer rmail-mime-mbox-buffer
diff --git a/lisp/simple.el b/lisp/simple.el
index 6e26e334372..8f37c8e5f0b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5585,7 +5585,10 @@ appears to have customizations applying to the old default,
   'mail-send-and-exit)
 
 (defun rfc822-goto-eoh ()
-  ;; Go to header delimiter line in a mail message, following RFC822 rules
+  "If the buffer starts with a mail header, move point to the header's end.
+Otherwise, moves to `point-min'.
+The end of the header is the start of the next line, if there is one,
+else the end of the last line.  This function obeys RFC822."
   (goto-char (point-min))
   (when (re-search-forward
          "^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move)