upstream

15 files changed, 134 insertions, 82 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38c536af62c..fcccc802203 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-19  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (hack-local-variables-prop-line, hack-local-variables):
+        Downcase "Mode:". (Bug#9331)
+
 2011-08-18  Chong Yidong  <cyd@stupidchicken.com>
 
         * international/characters.el: Add L and R categories.
diff --git a/lisp/files.el b/lisp/files.el
index 6b8a352f20c..8c7e63dda14 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3003,9 +3003,10 @@ mode, if there is one, otherwise nil."
                                                 "-mode"))))
                    (or (equal keyname "coding")
                        (condition-case nil
-                           (push (cons (if (eq key 'eval)
-                                           'eval
-                                         (indirect-variable key))
+                           (push (cons (cond ((eq key 'eval) 'eval)
+                                             ;; Downcase "Mode:".
+                                             ((equal keyname "mode") 'mode)
+                                             (t (indirect-variable key)))
                                        val) result)
                          (error nil))))
                  (skip-chars-forward " \t;")))
@@ -3153,6 +3154,7 @@ major-mode."
                            (var (let ((read-circle nil))
                                   (read str)))
                            val val2)
+                      (and (eq var 'Mode) (setq var 'mode))
                       ;; Read the variable value.
                       (skip-chars-forward "^:")
                       (forward-char 1)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 230bd8a6508..744817e68f2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-transform-headers): Protect against (NIL ...)
+        bodystructures (bug#9314).
+
+2011-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-insert-mime-button, gnus-mime-display-alternative):
+        Make button keymap non-sticky after buttons.
+
 2011-08-18  David Engster  <dengste@eml.cc>
 
         * nnmairix.el (nnmairix-request-set-mark)
@@ -7,8 +17,29 @@
         `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't
         available anymore.
 
+2011-08-12  Simon Josefsson  <simon@josefsson.org>
+
+        * starttls.el (starttls-any-program-available): Define as obsolete
+        function.
+
+2011-08-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-util.el (gnus-y-or-n-p): Reinstate the message-clearing y-or-n-p
+        versions which Gnus use when appropriate.
+
+        * gnus-group.el (gnus-group-clear-data): Add a y-or-n query, since it's
+        a pretty destructive command.
+
+        * nnmail.el (nnmail-extra-headers): Clarify slightly (bug#9302).
+
 2011-08-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * message.el (message-fix-before-sending): Make a different warning
+        about NUL characters (bug#9270).
+
+        * gnus-sum.el (gnus-auto-select-subject): Allow specifying a function
+        from custom (bug#9260).
+
         * gnus-spec.el (gnus-lrm-string): Use 8206 instead of ?\x200e to make
         things work in Emacs 22 and XEmacs, too.
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 28c6aca367c..c6e0180dadc 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5700,7 +5700,8 @@ all parts."
               gnus-callback gnus-mm-display-part
               gnus-part ,gnus-tmp-id
               article-type annotation
-              gnus-data ,handle))
+              gnus-data ,handle
+              rear-nonsticky t))
     (setq e (if (bolp)
                 ;; Exclude a newline.
                 (1- (point))
@@ -6013,7 +6014,8 @@ If displaying \"text/html\" is discouraged \(see
              ,gnus-mouse-face-prop ,gnus-article-mouse-face
              face ,gnus-article-button-face
              gnus-part ,id
-             article-type multipart))
+             article-type multipart
+             rear-nonsticky t))
           (widget-convert-button 'link from (point)
                                  :action 'gnus-widget-press-button
                                  :button-keymap gnus-widget-button-keymap)
@@ -6037,7 +6039,8 @@ If displaying \"text/html\" is discouraged \(see
                ,gnus-mouse-face-prop ,gnus-article-mouse-face
                face ,gnus-article-button-face
                gnus-part ,id
-               gnus-data ,handle))
+               gnus-data ,handle
+               rear-nonsticky t))
             (widget-convert-button 'link from (point)
                                    :action 'gnus-widget-press-button
                                    :button-keymap gnus-widget-button-keymap)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 2a31ccd34f0..5ae29053b6f 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3471,13 +3471,14 @@ sort in reverse order."
   "Clear all marks and read ranges from the current group.
 Obeys the process/prefix convention."
   (interactive "P")
-  (gnus-group-iterate arg
-    (lambda (group)
-      (let (info)
-        (gnus-info-clear-data (setq info (gnus-get-info group)))
-        (gnus-get-unread-articles-in-group info (gnus-active group) t)
-        (when (gnus-group-goto-group group)
-          (gnus-group-update-group-line))))))
+  (when (gnus-y-or-n-p "Really clear data? ")
+    (gnus-group-iterate arg
+      (lambda (group)
+        (let (info)
+          (gnus-info-clear-data (setq info (gnus-get-info group)))
+          (gnus-get-unread-articles-in-group info (gnus-active group) t)
+          (when (gnus-group-goto-group group)
+            (gnus-group-update-group-line)))))))
 
 (defun gnus-group-clear-data-on-native-groups ()
   "Clear all marks and read ranges from all native groups."
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index cd4699e6107..73ecffb090e 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -375,7 +375,8 @@ place point on some subject line."
                  (const unread)
                  (const first)
                  (const unseen)
-                 (const unseen-or-unread)))
+                 (const unseen-or-unread)
+                 (function :tag "Function to call")))
 
 (defcustom gnus-auto-select-next t
   "*If non-nil, offer to go to the next group from the end of the previous.
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 7155c7f9607..03ff4a2ea4b 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -388,57 +388,14 @@ TIME defaults to the current time."
           (define-key keymap key (pop plist))
         (pop plist)))))
 
-;; Two silly functions to ensure that all `y-or-n-p' questions clear
-;; the echo area.
-;;
-;; Do we really need these functions?  Workarounds for bugs in the corresponding
-;; Emacs functions?  Maybe these bugs are no longer present in any supported
-;; (X)Emacs version?  Alias them to the original functions and see if anyone
-;; reports a problem.  If not, replace with original functions.  --rsteib,
-;; 2007-12-14
-;;
-;; All supported Emacsen clear the echo area after `yes-or-no-p', so we can
-;; remove `yes-or-no-p'.  RMS says that not clearing after `y-or-n-p' is
-;; intentional (see below), so we could remove `gnus-y-or-n-p' too.
-;; Objections?  --rsteib, 2008-02-16
-;;
-;; ,----[ http://thread.gmane.org/gmane.emacs.gnus.general/65099/focus=66070 ]
-;; | From: Richard Stallman
-;; | Subject: Re: Do we need gnus-yes-or-no-p and gnus-y-or-n-p?
-;; | To: Katsumi Yamaoka [...]
-;; | Cc: emacs-devel@[...], xemacs-beta@[...], ding@[...]
-;; | Date: Mon, 07 Jan 2008 12:16:05 -0500
-;; | Message-ID: <E1JBva1-000528-VY@fencepost.gnu.org>
-;; |
-;; |     The behavior of `y-or-n-p' that it doesn't clear the question
-;; |     and the answer is not serious of course, but I feel it is not
-;; |     cool.
-;; |
-;; | It is intentional.
-;; |
-;; |     Currently, it is commented out in the trunk by Reiner Steib.  He
-;; |     also wrote the benefit of leaving the question and the answer in
-;; |     the echo area as follows:
-;; |
-;; |     (http://article.gmane.org/gmane.emacs.gnus.general/66061)
-;; |     > In contrast to yes-or-no-p it is much easier to type y, n,
-;; |     > SPC, DEL, etc accidentally, so it might be useful for the user
-;; |     > to see what he has typed.
-;; |
-;; | Yes, that is the reason.
-;; `----
-
-;; (defun gnus-y-or-n-p (prompt)
-;;   (prog1
-;;       (y-or-n-p prompt)
-;;     (message "")))
-;; (defun gnus-yes-or-no-p (prompt)
-;;   (prog1
-;;       (yes-or-no-p prompt)
-;;     (message "")))
-
-(defalias 'gnus-y-or-n-p 'y-or-n-p)
-(defalias 'gnus-yes-or-no-p 'yes-or-no-p)
+(defun gnus-y-or-n-p (prompt)
+  (prog1
+      (y-or-n-p prompt)
+    (message "")))
+(defun gnus-yes-or-no-p (prompt)
+  (prog1
+      (yes-or-no-p prompt)
+    (message "")))
 
 ;; By Frank Schmitt <ich@Frank-Schmitt.net>. Allows to have
 ;; age-depending date representations. (e.g. just the time if it's
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index a157afe2ce6..52cef1925a2 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4254,8 +4254,10 @@ conformance."
                  "Invisible text found and made visible; continue sending? ")
           (error "Invisible text found and made visible")))))
   (message-check 'illegible-text
-    (let (char found choice)
+    (let (char found choice nul-chars)
       (message-goto-body)
+      (setq nul-chars (save-excursion
+                        (search-forward "\000" nil t)))
       (while (progn
                (skip-chars-forward mm-7bit-chars)
                (when (get-text-property (point) 'no-illegible-text)
@@ -4281,7 +4283,9 @@ conformance."
       (when found
         (setq choice
               (gnus-multiple-choice
-               "Non-printable characters found.  Continue sending?"
+               (if nul-chars
+                   "NUL characters found, which may cause problems.  Continue sending?"
+                 "Non-printable characters found.  Continue sending?")
                `((?d "Remove non-printable characters and send")
                  (?r ,(format
                        "Replace non-printable characters with \"%s\" and send"
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index c940e06fbb6..2dbc465f8c9 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -216,9 +216,10 @@ textual parts.")
           (let ((structure (ignore-errors
                              (read (current-buffer)))))
             (while (and (consp structure)
-                        (not (stringp (car structure))))
+                        (not (atom (car structure))))
               (setq structure (car structure)))
             (setq lines (if (and
+                             (stringp (car structure))
                              (equal (upcase (nth 0 structure)) "MESSAGE")
                              (equal (upcase (nth 1 structure)) "RFC822"))
                             (nth 9 structure)
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 8906a036779..dc2080dee1a 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -554,7 +554,9 @@ parameter.  It should return nil, `warn' or `delete'."
                  (const delete)))
 
 (defcustom nnmail-extra-headers '(To Newsgroups)
-  "*Extra headers to parse."
+  "Extra headers to parse.
+In addition to the standard headers, these extra headers will be
+included in NOV headers (and the like) when backends parse headers."
   :version "21.1"
   :group 'nnmail
   :type '(repeat symbol))
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index c1caca90cf0..b995f7478ce 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -301,6 +301,10 @@ GNUTLS requires a port number."
                        starttls-gnutls-program
                      starttls-program)))
 
+(defalias 'starttls-any-program-available 'starttls-available-p)
+(make-obsolete 'starttls-any-program-available 'starttls-available-p
+               "2011-08-02")
+
 (provide 'starttls)
 
 ;;; starttls.el ends here
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 313298de97e..b82147b97f1 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1119,13 +1119,27 @@ It also eliminates runs of equal strings."
                                        `(display (space :align-to ,column)))
                   nil))))
             (if (not (consp str))
-                (put-text-property (point) (progn (insert str) (point))
+                (put-text-property (point)
+                                   (progn
+                                     (insert (bidi-string-mark-left-to-right
+                                              str))
+                                     (point))
                                    'mouse-face 'highlight)
-              (put-text-property (point) (progn (insert (car str)) (point))
+              (put-text-property (point)
+                                 (progn
+                                   (insert
+                                    (bidi-string-mark-left-to-right
+                                     (car str)))
+                                   (point))
                                  'mouse-face 'highlight)
-              (add-text-properties (point) (progn (insert (cadr str)) (point))
+              (add-text-properties (point)
+                                   (progn
+                                     (insert
+                                      (bidi-string-mark-left-to-right
+                                       (cadr str)))
+                                     (point))
                                    '(mouse-face nil
-                                     face completions-annotations)))
+                                                face completions-annotations)))
             (cond
              ((eq completions-format 'vertical)
               ;; Vertical format
diff --git a/src/ChangeLog b/src/ChangeLog
index 2b5b6fd0602..85a55b2b7c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * xfaces.c (face_at_buffer_position): Avoid repeated evaluation of
+        face ID by FACE_FROM_ID, and avoid a crash when mouse is moved
+        from an Org mode buffer to a Speedbar frame.
+
+        * xdisp.c (RECORD_MAX_MIN_POS): If the display element comes from
+        a composition, take its buffer position from IT->cmp_it.charpos.
+        Fixes cursor positioning at the beginning of a line that begins
+        with a composed character.
+
 2011-08-18  Eli Zaretskii  <eliz@gnu.org>
 
         * bidi.c (bidi_get_type): If bidi_type_table reports zero as the
diff --git a/src/xdisp.c b/src/xdisp.c
index b26d844cdf2..2cd1bb9bfdb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18491,15 +18491,22 @@ display_line (struct it *it)
 #define RECORD_MAX_MIN_POS(IT)                                  \
   do                                                            \
     {                                                           \
-      if (IT_CHARPOS (*(IT)) < min_pos)                         \
+      int composition_p = (IT)->what == IT_COMPOSITION;         \
+      EMACS_INT current_pos =                                   \
+        composition_p ? (IT)->cmp_it.charpos                    \
+                      : IT_CHARPOS (*(IT));                     \
+      EMACS_INT current_bpos =                                  \
+        composition_p ? CHAR_TO_BYTE (current_pos)              \
+                      : IT_BYTEPOS (*(IT));                     \
+      if (current_pos < min_pos)                                \
         {                                                       \
-          min_pos = IT_CHARPOS (*(IT));                         \
-          min_bpos = IT_BYTEPOS (*(IT));                        \
+          min_pos = current_pos;                                \
+          min_bpos = current_bpos;                              \
         }                                                       \
-      if (IT_CHARPOS (*(IT)) > max_pos)                         \
+      if (current_pos > max_pos)                                \
         {                                                       \
-          max_pos = IT_CHARPOS (*(IT));                         \
-          max_bpos = IT_BYTEPOS (*(IT));                        \
+          max_pos = current_pos;                                \
+          max_bpos = current_bpos;                              \
         }                                                       \
     }                                                           \
   while (0)
diff --git a/src/xfaces.c b/src/xfaces.c
index 83c92cdbc52..52b86638a50 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6008,9 +6008,18 @@ face_at_buffer_position (struct window *w, EMACS_INT pos,
 
   *endptr = endpos;
 
-  default_face = FACE_FROM_ID (f, base_face_id >= 0 ? base_face_id
-                               : NILP (Vface_remapping_alist) ? DEFAULT_FACE_ID
-                               : lookup_basic_face (f, DEFAULT_FACE_ID));
+  {
+    int face_id;
+
+    if (base_face_id >= 0)
+      face_id = base_face_id;
+    else if (NILP (Vface_remapping_alist))
+      face_id = DEFAULT_FACE_ID;
+    else
+      face_id = lookup_basic_face (f, DEFAULT_FACE_ID);
+
+    default_face = FACE_FROM_ID (f, face_id);
+  }
 
   /* Optimize common cases where we can use the default face.  */
   if (noverlays == 0