auto upstream

28 files changed, 269 insertions, 88 deletions

diff --git a/admin/notes/bzr b/admin/notes/bzr
index cdcfa7e7e3d..f35ff95f9d6 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -267,3 +267,52 @@ For example, on RHEL6 I needed:
   yum --enablerepo=epel install python-simpletal
 
 Then point your web-browser to http://127.0.0.1:8080/ .
+
+* Bisecting
+
+This is a semi-automated way to find the revision that introduced a bug.
+
+First, get the bzr bisect plugin if you do not have it already:
+
+  cd ~/.bazaar/plugins
+  bzr branch lp:bzr-bisect bisect
+
+`bzr help bisect' should work now.
+
+It's probably simplest to make a new copy of the branch to work in
+from this point onwards.
+
+Identify the last known "good" revision where the relevant issue is
+NOT present (e.g. maybe Emacs 24.1).  Let's say this is revision 1000.
+
+  bzr bisect start
+  bzr bisect no -r 1000
+
+At this point, bzr will switch to the mid-point of revision 1000 and
+the current revision.  If you know that the issue was definitely
+present in some specific revision (say 2000), you can use:
+
+  bzr bisect yes -r 2000
+
+Now bzr switches to revision 1500.
+
+Now test whether the issue is present.  You might need to rebuild
+Emacs to do this, or if you know the problem is in a specific Lisp
+file, you might be able to get away with just loading that one file in
+current Emacs.
+
+If the issue is present, use
+
+  bzr bisect yes
+
+If it is not, use
+
+  bzr bisect no
+
+Repeat until you zero-in on the specific revision.
+
+When finished, use
+
+  bzr bisect reset
+
+or simply delete the entire branch if you created it just for this.
diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index ee51d5456cc..3ccd180aa0c 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -22,7 +22,8 @@ inclusion in a future version of Emacs (see below).
 
 If you don't feel up to hacking Emacs, there are many other ways to
 help.  You can answer questions on the mailing lists, write
-documentation, find and report bugs, contribute to the Emacs web
+documentation, find and report bugs, check if existing bug reports
+are fixed in newer versions of Emacs, contribute to the Emacs web
 pages, or develop a package that works with Emacs.
 
 Here are some style and legal conventions for contributors to Emacs:
diff --git a/etc/TODO b/etc/TODO
index 912d0746849..b28888b7484 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -7,9 +7,24 @@ See the end of the file for license conditions.
 If you are ready to start working on any of these TODO items, we
 appreciate your help; please write to emacs-devel@gnu.org so we can be
 aware that the problem is being addressed, and talk with you how to do
-it best.  Since Emacs is an FSF-copyrighted package, please be
-prepared to sign legal papers to transfer the copyright on your work
-to the FSF.
+it best.  Also to check that it hasn't been done already, since we
+don't always remember to update this file!  It is best to consult
+the latest version of this file in the Emacs source code repository.
+
+Since Emacs is an FSF-copyrighted package, please be prepared to sign
+legal papers to transfer the copyright on your work to the FSF.
+For more details on this, see the section "Copyright Assignment"
+in etc/CONTRIBUTE.  That file also contains some more practical
+details about getting involved.
+
+As well as the issues listed here, there are bug reports at
+<http://debbugs.gnu.org>.  Bugs tagged "easy" ought to be suitable for
+beginners to work on, but unfortunately we are not very good at using
+this tag.  Bugs tagged "help" are ones where assistance is required,
+but may be difficult to fix.  Bugs with severity "important" or higher
+are the ones we consider more important, but these also may be
+difficult to fix.  Bugs with severity "minor" may be simpler, but this
+is not always true.
 
 * Tentative plan for Emacs-24
 
@@ -61,7 +76,7 @@ to use it.
 ** Convert all defvars with leading `*' in the doc-strings into defcustoms
 of appropriate :type and :group.
 
-** Remove any leading `*'s from defcustom doc-strings.
+** Remove any leading `*'s from defcustom doc-strings.  [done?]
 
 ** Remove unnecessary autoload cookies from defcustoms.
 This needs a bit of care, since often people have become used to
@@ -267,6 +282,9 @@ specified filters, specified timers, and specified hooks.
 ** Remove the limitation that window and frame widths and heights can
   be only full columns/lines.
 
+** The GNUstep port needs some serious attention, ideally from someone
+familiar with GNUstep and Objective C.
+
 * Other features we would like:
 
 ** Allow frames(terminals) created by emacsclient to inherit their environment
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66c18a25803..3d5308875de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,28 @@
+2013-02-17  Didier Verna  <didier@didierverna.net>
+
+        * net/network-stream.el (network-stream-open-starttls):
+        Check that response to the starttls-command is non-nil.  (Bug#13706)
+
+2013-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * font-lock.el (lisp-font-lock-keywords-1, lisp-font-lock-keywords-2):
+        Don't assume all identifier chars have syntax word.
+        * emacs-lisp/lisp-mode.el (lisp-mode-variables):
+        Remove bar-not-symbol.  Adjust callers.
+        (lisp-mode-variables): Don't set a font-lock-syntax-table.
+
+2013-02-17  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-keepalive): Fix invalid timer error.
+
+2013-02-17  Glenn Morris  <rgm@gnu.org>
+
+        * menu-bar.el (menu-bar-tools-menu): Fix case of EDE entry.
+
+        * image-mode.el (image-mode-map): Add image-dired menu entry.
+
+        * image-dired.el (tumme): Make this alias obsolete.
+
 2013-02-16  Glenn Morris  <rgm@gnu.org>
 
         * image.el (image-animated-types): Remove.
@@ -20,8 +45,8 @@
 
         * net/tramp-compat.el (top): Require 'trampver.
 
-        * net/tramp-sh.el (tramp-remote-process-environment): Set
-        tramp-autoload cookie.
+        * net/tramp-sh.el (tramp-remote-process-environment):
+        Set tramp-autoload cookie.
 
 2013-02-16  Kevin Ryde  <user42@zip.com.au>
 
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index cd60d80b056..4ebaa0a49d5 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -187,14 +187,12 @@ It has `lisp-mode-abbrev-table' as its parent."
               font-lock-string-face))))
     font-lock-comment-face))
 
-(defun lisp-mode-variables (&optional lisp-syntax keywords-case-insensitive
-                                      bar-not-symbol)
+(defun lisp-mode-variables (&optional lisp-syntax keywords-case-insensitive)
   "Common initialization routine for lisp modes.
 The LISP-SYNTAX argument is used by code in inf-lisp.el and is
 \(uselessly) passed from pp.el, chistory.el, gnus-kill.el and
 score-mode.el.  KEYWORDS-CASE-INSENSITIVE non-nil means that for
-font-lock keywords will not be case sensitive.  BAR-NOT-SYMBOL
-non-nil means that | is not a symbol character."
+font-lock keywords will not be case sensitive."
   (when lisp-syntax
     (set-syntax-table lisp-mode-syntax-table))
   (setq-local paragraph-ignore-fill-prefix t)
@@ -228,9 +226,7 @@ non-nil means that | is not a symbol character."
   (setq font-lock-defaults
         `((lisp-font-lock-keywords
            lisp-font-lock-keywords-1 lisp-font-lock-keywords-2)
-          nil ,keywords-case-insensitive
-          ((,(concat "+-*/.<>=!?$%_&~^:@" (if bar-not-symbol "" "|")) . "w"))
-          nil
+          nil ,keywords-case-insensitive nil nil
           (font-lock-mark-block-function . mark-defun)
           (font-lock-syntactic-face-function
            . lisp-font-lock-syntactic-face-function))))
@@ -553,7 +549,7 @@ or to switch back to an existing one.
 
 Entry to this mode calls the value of `lisp-mode-hook'
 if that value is non-nil."
-  (lisp-mode-variables nil t t)
+  (lisp-mode-variables nil t)
   (setq-local find-tag-default-function 'lisp-find-tag-default)
   (setq-local comment-start-skip
               "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6e3476ac9a5..e5ce4db171b 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2259,10 +2259,10 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
                 "\\(const\\(ant\\)?\\|custom\\|varalias\\|face\\|parameter\\|var\\(?:-local\\)?\\)\\|"
                 ;; Structure declarations.
                 "\\(class\\|group\\|theme\\|package\\|struct\\|type\\)"
-                "\\)\\)\\>"
+                "\\)\\)\\_>"
                 ;; Any whitespace and defined object.
                 "[ \t'\(]*"
-                "\\(setf[ \t]+\\sw+\\|\\sw+\\)?")
+                "\\(setf[ \t]+\\(?:\\sw\\|\\s_\\)+\\|\\(?:\\sw\\|\\s_\\)+\\)?")
        (1 font-lock-keyword-face)
        (9 (cond ((match-beginning 3) font-lock-function-name-face)
                 ((match-beginning 6) font-lock-variable-name-face)
@@ -2299,7 +2299,7 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
                  "with-silent-modifications" "with-syntax-table"
                  "with-temp-buffer" "with-temp-file" "with-temp-message"
                  "with-timeout" "with-timeout-handler" "with-wrapper-hook") t)
-          "\\>")
+          "\\_>")
           .  1)
        ;; Control structures.  Common Lisp forms.
        (,(concat
@@ -2320,23 +2320,25 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
                  "with-open-stream" "with-output-to-string"
                  "with-package-iterator" "with-simple-restart"
                  "with-slots" "with-standard-io-syntax") t)
-          "\\>")
+          "\\_>")
           . 1)
        ;; Exit/Feature symbols as constants.
        (,(concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\>"
-                 "[ \t']*\\(\\sw+\\)?")
+                 "[ \t']*\\(\\(?:\\sw\\|\\s_\\)+\\)?")
         (1 font-lock-keyword-face)
         (2 font-lock-constant-face nil t))
        ;; Erroneous structures.
        ("(\\(abort\\|assert\\|warn\\|check-type\\|cerror\\|error\\|signal\\)\\>" 1 font-lock-warning-face)
        ;; Words inside \\[] tend to be for `substitute-command-keys'.
-       ("\\\\\\\\\\[\\(\\sw+\\)\\]" 1 font-lock-constant-face prepend)
+       ("\\\\\\\\\\[\\(\\(?:\\sw\\|\\s_\\)+\\)\\]"
+        (1 font-lock-constant-face prepend))
        ;; Words inside `' tend to be symbol names.
-       ("`\\(\\sw\\sw+\\)'" 1 font-lock-constant-face prepend)
+       ("`\\(\\(?:\\sw\\|\\s_\\)\\(?:\\sw\\|\\s_\\)+\\)'"
+        (1 font-lock-constant-face prepend))
        ;; Constant values.
-       ("\\<:\\sw+\\>" 0 font-lock-builtin-face)
+       ("\\<:\\(?:\\sw\\|\\s_\\)+\\>" 0 font-lock-builtin-face)
        ;; ELisp and CLisp `&' keywords as types.
-       ("\\<\\&\\sw+\\>" . font-lock-type-face)
+       ("\\<\\&\\(?:\\sw\\|\\s_\\)+\\>" . font-lock-type-face)
        ;; ELisp regexp grouping constructs
        ((lambda (bound)
           (catch 'found
@@ -2353,11 +2355,11 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
                     (throw 'found t)))))))
         (1 'font-lock-regexp-grouping-backslash prepend)
         (3 'font-lock-regexp-grouping-construct prepend))
-;;;  This is too general -- rms.
-;;;  A user complained that he has functions whose names start with `do'
-;;;  and that they get the wrong color.
-;;;      ;; CL `with-' and `do-' constructs
-;;;      ("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
+       ;; This is too general -- rms.
+       ;; A user complained that he has functions whose names start with `do'
+       ;; and that they get the wrong color.
+       ;; ;; CL `with-' and `do-' constructs
+       ;;("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
       )))
   "Gaudy level highlighting for Lisp modes.")
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5030da87672..8de9e89a23d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,18 @@
+2013-02-17  Daiki Ueno  <ueno@gnu.org>
+
+        * mml2015.el (epg-key-user-id-list, epg-user-id-string)
+        (epg-user-id-validity): Autoload.
+        (mml2015-epg-check-user-id): New function.
+        (mml2015-epg-check-sub-key): New function split from
+        mml2015-epg-find-usable-key.
+        (mml2015-epg-find-usable-key): Accept context, name, usage, and
+        optional name-is-key-id, to handle the case when user-id is unusable.
+        Reported by Łukasz Stelmach <stlman@poczta.fm>.
+
+2013-02-17  Glenn Morris  <rgm@gnu.org>
+
+        * shr.el (shr-put-image): Use image-multi-frame-p if available.
+
 2013-02-16  Glenn Morris  <rgm@gnu.org>
 
         * shr.el (shr-put-image): Only animate images that specify a delay.
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 275a4867e85..b20c02aa26f 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -757,6 +757,9 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 (autoload 'epg-sub-key-fingerprint "epg")
 (autoload 'epg-signature-key-id "epg")
 (autoload 'epg-signature-to-string "epg")
+(autoload 'epg-key-user-id-list "epg")
+(autoload 'epg-user-id-string "epg")
+(autoload 'epg-user-id-validity "epg")
 (autoload 'epg-configuration "epg-config")
 (autoload 'epg-expand-group "epg-config")
 (autoload 'epa-select-keys "epa")
@@ -786,21 +789,53 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
               (cons password-cache-key-id mml2015-epg-secret-key-id-list))
         (copy-sequence passphrase)))))
 
-(defun mml2015-epg-find-usable-key (keys usage)
-  (catch 'found
+(defun mml2015-epg-check-user-id (key recipient)
+  (let ((pointer (epg-key-user-id-list key))
+        result)
+    (while pointer
+      (if (and (equal (car (mail-header-parse-address
+                            (epg-user-id-string (car pointer))))
+                      (car (mail-header-parse-address
+                            recipient)))
+               (not (memq (epg-user-id-validity (car pointer))
+                          '(revoked expired))))
+          (setq result t
+                pointer nil)
+        (setq pointer (cdr pointer))))
+    result))
+
+(defun mml2015-epg-check-sub-key (key usage)
+  (let ((pointer (epg-key-sub-key-list key))
+        result)
+    ;; The primary key will be marked as disabled, when the entire
+    ;; key is disabled (see 12 Field, Format of colon listings, in
+    ;; gnupg/doc/DETAILS)
+    (unless (memq 'disabled (epg-sub-key-capability (car pointer)))
+      (while pointer
+        (if (and (memq usage (epg-sub-key-capability (car pointer)))
+                 (not (memq (epg-sub-key-validity (car pointer))
+                            '(revoked expired))))
+            (setq result t
+                  pointer nil)
+          (setq pointer (cdr pointer)))))
+    result))
+
+(defun mml2015-epg-find-usable-key (context name usage
+                                            &optional name-is-key-id)
+  (let ((keys (epg-list-keys context name))
+        key)
     (while keys
-      (let ((pointer (epg-key-sub-key-list (car keys))))
-        ;; The primary key will be marked as disabled, when the entire
-        ;; key is disabled (see 12 Field, Format of colon listings, in
-        ;; gnupg/doc/DETAILS)
-        (unless (memq 'disabled (epg-sub-key-capability (car pointer)))
-          (while pointer
-            (if (and (memq usage (epg-sub-key-capability (car pointer)))
-                     (not (memq (epg-sub-key-validity (car pointer))
-                                '(revoked expired))))
-                (throw 'found (car keys)))
-            (setq pointer (cdr pointer)))))
-      (setq keys (cdr keys)))))
+      (if (and (or name-is-key-id
+                   ;; Non email user-id can be supplied through
+                   ;; mml2015-signers if mml2015-encrypt-to-self is set.
+                   ;; Treat it as valid, as it is user's intention.
+                   (not (string-match "\\`<" name))
+                   (mml2015-epg-check-user-id (car keys) name))
+               (mml2015-epg-check-sub-key (car keys) usage))
+          (setq key (car keys)
+                keys nil)
+        (setq keys (cdr keys))))
+    key))
 
 ;; XXX: since gpg --list-secret-keys does not return validity of each
 ;; key, `mml2015-epg-find-usable-key' defined above is not enough for
@@ -811,10 +846,12 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
         secret-key)
     (while (and (not secret-key) secret-keys)
       (if (mml2015-epg-find-usable-key
-           (epg-list-keys context (epg-sub-key-fingerprint
-                                   (car (epg-key-sub-key-list
-                                         (car secret-keys)))))
-           usage)
+           context
+           (epg-sub-key-fingerprint
+            (car (epg-key-sub-key-list
+                  (car secret-keys))))
+           usage
+           t)
           (setq secret-key (car secret-keys)
                 secret-keys nil)
         (setq secret-keys (cdr secret-keys))))
@@ -1115,8 +1152,7 @@ If no one is selected, symmetric encryption will be performed.  "
                     (mapcar
                      (lambda (recipient)
                        (setq recipient-key (mml2015-epg-find-usable-key
-                                            (epg-list-keys context recipient)
-                                            'encrypt))
+                                            context recipient 'encrypt))
                        (unless (or recipient-key
                                    (y-or-n-p
                                     (format "No public key for %s; skip it? "
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 1294ca7cd69..886f4da53dc 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -615,8 +615,12 @@ size, and full-buffer size."
                   (overlay-put overlay 'face 'default)))
             (insert-image image (or alt "*")))
           (put-text-property start (point) 'image-size size)
-          ;; Only animate multi-frame things that specify a delay.  FIXME?
-          (when (cdr (image-animated-p image))
+          (when (if (fboundp 'image-multi-frame-p)
+                    ;; Only animate multi-frame things that specify a
+                    ;; delay; eg animated gifs as opposed to
+                    ;; multi-page tiffs.  FIXME?
+                    (cdr (image-multi-frame-p image))
+                  (image-animated-p image))
             (image-animate image nil 60)))
         image)
     (insert alt)))
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 354e16b0bfb..bbb41d49a1d 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -883,7 +883,7 @@ displayed."
 (defalias 'image-dired 'image-dired-show-all-from-dir)
 
 ;;;###autoload
-(defalias 'tumme 'image-dired-show-all-from-dir)
+(define-obsolete-function-alias 'tumme 'image-dired "24.4")
 
 (defun image-dired-sane-db-file ()
   "Check if `image-dired-db-file' exists.
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 52367811341..7787a26cc08 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -376,9 +376,15 @@ call."
          :visible (eq image-type 'imagemagick)
          :help "Rotate the image"]
         "--"
-        ["Next Image" image-next-file :active t
+        ["Show Thumbnails"
+         (lambda ()
+           (interactive)
+           (image-dired default-directory))
+         :active default-directory
+         :help "Show thumbnails for all images in this directory"]
+        ["Next Image" image-next-file :active buffer-file-name
          :help "Move to next image in this directory"]
-        ["Previous Image" image-previous-file :active t
+        ["Previous Image" image-previous-file :active buffer-file-name
          :help "Move to previous image in this directory"]
         "--"
         ["Animate Image" image-toggle-animation :style toggle
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 60f2bc2999f..be459fe38d5 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1518,7 +1518,7 @@ mail status in mode line"))
                   :button (:toggle . (bound-and-true-p semantic-mode))))
 
     (bindings--define-key menu [ede]
-      '(menu-item "Project support (EDE)"
+      '(menu-item "Project Support (EDE)"
                   global-ede-mode
                   :help "Toggle the Emacs Development Environment (Global EDE mode)"
                   :button (:toggle . (bound-and-true-p global-ede-mode))))
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 8cf9ec67e53..fd21997ba28 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -262,8 +262,9 @@ STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality.
         ;; EHLO for SMTP.
         (when (plist-get parameters :always-query-capabilities)
           (network-stream-command stream capability-command eo-capa)))
-      (when (string-match success-string
-                          (network-stream-command stream starttls-command eoc))
+      (when (let ((response
+                   (network-stream-command stream starttls-command eoc)))
+              (and response (string-match success-string response)))
         ;; The server said it was OK to begin STARTTLS negotiations.
         (if builtin-starttls
             (let ((cert (network-stream-certificate host service parameters)))
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 086043c2b4a..7c70ded3eaa 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -625,7 +625,8 @@ last ping."
                                            (rcirc-float-time))))))
             (rcirc-process-list))
     ;; no processes, clean up timer
-    (cancel-timer rcirc-keepalive-timer)
+    (when (timerp rcirc-keepalive-timer)
+      (cancel-timer rcirc-keepalive-timer))
     (setq rcirc-keepalive-timer nil)))
 
 (defun rcirc-handler-ctcp-KEEPALIVE (process target sender message)
diff --git a/src/ChangeLog b/src/ChangeLog
index 4d39a32e883..e945e221593 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2013-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (x_draw_vertical_border): For a window that is neither
+        the leftmost nor the rightmost, redraw both the left and the right
+        vertical borders.  (Bug#13723)
+
+2013-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xml.c (init_libxml2_functions):
+        * sound.c (sound_warning):
+        * sheap.c (report_sheap_usage):
+        * process.c (wait_reading_process_output):
+        * msdos.c (XMenuActivate):
+        * macros.c (Fstart_kbd_macro, Fend_kbd_macro):
+        * keyboard.c (top_level_1):
+        * editfns.c (Fmessage, Fmessage_box):
+        * callint.c (Fcall_interactively):
+        * fns.c (Fyes_or_no_p): Prefer `message1' over `message'.
+
+2013-02-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (syms_of_xterm): Move scroll-bar-adjust-thumb-portion ...
+        * frame.c (syms_of_frame): ... to here.
+
 2013-02-16  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (sys_chown): Remove unused function.
diff --git a/src/callint.c b/src/callint.c
index 1a125d3e865..3e295a3b26b 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -690,7 +690,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
                 Lisp_Object str;
                 if (! first)
                   {
-                    message ("Please enter a number.");
+                    message1 ("Please enter a number.");
                     sit_for (make_number (1), 0, 0);
                   }
                 first = 0;
diff --git a/src/editfns.c b/src/editfns.c
index c5cd8b0b725..bee0bcc158d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3451,7 +3451,7 @@ usage: (message FORMAT-STRING &rest ARGS)  */)
       || (STRINGP (args[0])
           && SBYTES (args[0]) == 0))
     {
-      message (0);
+      message1 (0);
       return args[0];
     }
   else
@@ -3477,7 +3477,7 @@ usage: (message-box FORMAT-STRING &rest ARGS)  */)
 {
   if (NILP (args[0]))
     {
-      message (0);
+      message1 (0);
       return Qnil;
     }
   else
diff --git a/src/fns.c b/src/fns.c
index 527976593da..44ddf340856 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2485,7 +2485,7 @@ is nil, and `use-dialog-box' is non-nil.  */)
 
       Fding (Qnil);
       Fdiscard_input ();
-      message ("Please answer yes or no.");
+      message1 ("Please answer yes or no.");
       Fsleep_for (make_number (2), Qnil);
     }
 }
diff --git a/src/frame.c b/src/frame.c
index 9c26af819bc..0fa821682f3 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4233,6 +4233,16 @@ Setting this variable does not affect existing frames, only new ones.  */);
   Vdefault_frame_scroll_bars = Qnil;
 #endif
 
+  DEFVAR_BOOL ("scroll-bar-adjust-thumb-portion",
+               scroll_bar_adjust_thumb_portion_p,
+               doc: /* Adjust thumb for overscrolling for Gtk+ and MOTIF.
+Non-nil means adjust the thumb in the scroll bar so it can be dragged downwards
+even if the end of the buffer is shown (i.e. overscrolling).
+Set to nil if you want the thumb to be at the bottom when the end of the buffer
+is shown.  Also, the thumb fills the whole scroll bar when the entire buffer
+is visible.  In this case you can not overscroll.  */);
+  scroll_bar_adjust_thumb_portion_p = 1;
+
   DEFVAR_LISP ("terminal-frame", Vterminal_frame,
                doc: /* The initial frame-object, which represents Emacs's stdout.  */);
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 0d60dc8929d..3c00e017498 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1188,13 +1188,13 @@ top_level_2 (void)
 static Lisp_Object
 top_level_1 (Lisp_Object ignore)
 {
-  /* On entry to the outer level, run the startup file */
+  /* On entry to the outer level, run the startup file.  */
   if (!NILP (Vtop_level))
     internal_condition_case (top_level_2, Qerror, cmd_error);
   else if (!NILP (Vpurify_flag))
-    message ("Bare impure Emacs (standard Lisp code not loaded)");
+    message1 ("Bare impure Emacs (standard Lisp code not loaded)");
   else
-    message ("Bare Emacs (standard Lisp code not loaded)");
+    message1 ("Bare Emacs (standard Lisp code not loaded)");
   return Qnil;
 }
 
diff --git a/src/macros.c b/src/macros.c
index 1eef9b678f4..0dcfbe5532c 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -78,7 +78,7 @@ macro before appending to it. */)
         }
       current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
       current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
-      message ("Defining kbd macro...");
+      message1 ("Defining kbd macro...");
     }
   else
     {
@@ -125,7 +125,7 @@ macro before appending to it. */)
         Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
                             make_number (1), Qnil);
 
-      message ("Appending to kbd macro...");
+      message1 ("Appending to kbd macro...");
     }
   kset_defining_kbd_macro (current_kboard, Qt);
 
@@ -172,21 +172,21 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
   if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
     {
       end_kbd_macro ();
-      message ("Keyboard macro defined");
+      message1 ("Keyboard macro defined");
     }
 
   if (XFASTINT (repeat) == 0)
     Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), repeat, loopfunc);
   else if (XINT (repeat) > 1)
     {
-      XSETINT (repeat, XINT (repeat)-1);
+      XSETINT (repeat, XINT (repeat) - 1);
       Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
                           repeat, loopfunc);
     }
   return Qnil;
 }
 
-/* Store character c into kbd macro being defined */
+/* Store character c into kbd macro being defined.  */
 
 void
 store_kbd_macro_char (Lisp_Object c)
diff --git a/src/msdos.c b/src/msdos.c
index 527a75c8c2f..ac8c90455d7 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -3281,10 +3281,10 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
      erasing it works correctly...  */
   if (! NILP (saved_echo_area_message))
     message_with_string ("%s", saved_echo_area_message, 0);
-  message (0);
+  message1 (0);
   while (statecount--)
     xfree (state[statecount].screen_behind);
-  IT_display_cursor (1);        /* turn cursor back on */
+  IT_display_cursor (1);        /* Turn cursor back on.  */
   /* Clean up any mouse events that are waiting inside Emacs event queue.
      These events are likely to be generated before the menu was even
      displayed, probably because the user pressed and released the button
diff --git a/src/process.c b/src/process.c
index 9d6e8c097a1..5b15ade1122 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4218,7 +4218,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
   if (time_limit == 0 && nsecs == 0 && wait_proc && !NILP (Vinhibit_quit)
       && !(CONSP (wait_proc->status)
            && EQ (XCAR (wait_proc->status), Qexit)))
-    message ("Blocking call to accept-process-output with quit inhibited!!");
+    message1 ("Blocking call to accept-process-output with quit inhibited!!");
 
   /* If wait_proc is a process to watch, set wait_channel accordingly.  */
   if (wait_proc != NULL)
diff --git a/src/sheap.c b/src/sheap.c
index 972c04c9552..06e205bc0e5 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -91,5 +91,5 @@ report_sheap_usage (int die_if_pure_storage_exceeded)
   char buf[200];
   sprintf (buf, "Static heap usage: %d of %d bytes",
            bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
-  message ("%s", buf);
+  message1 (buf);
 }
diff --git a/src/sound.c b/src/sound.c
index 802f1ce740d..9c472fb0263 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -334,7 +334,7 @@ sound_perror (const char *msg)
 static void
 sound_warning (const char *msg)
 {
-  message ("%s", msg);
+  message1 (msg);
 }
 
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 9da8679382e..68be426f807 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28496,6 +28496,9 @@ x_draw_vertical_border (struct window *w)
   if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
     return;
 
+  /* Note: It is necessary to redraw bot the left and the right
+     borders, for when only this single window W is being
+     redisplayed.  */
   if (!WINDOW_RIGHTMOST_P (w)
       && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
     {
@@ -28509,8 +28512,8 @@ x_draw_vertical_border (struct window *w)
 
       FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1);
     }
-  else if (!WINDOW_LEFTMOST_P (w)
-           && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
+  if (!WINDOW_LEFTMOST_P (w)
+      && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
     {
       int x0, x1, y0, y1;
 
diff --git a/src/xml.c b/src/xml.c
index 5a52b0c2a1e..4b466dc1bca 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -93,7 +93,7 @@ init_libxml2_functions (void)
 
       if (!(library = w32_delayed_load (Qlibxml2_dll)))
         {
-          message ("%s", "libxml2 library not found");
+          message1 ("libxml2 library not found");
           return 0;
         }
 
diff --git a/src/xterm.c b/src/xterm.c
index e92123583b0..66381fde52f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10791,16 +10791,6 @@ With MS Windows or Nextstep, the value is t.  */);
   Vx_toolkit_scroll_bars = Qnil;
 #endif
 
-  DEFVAR_BOOL ("scroll-bar-adjust-thumb-portion",
-               scroll_bar_adjust_thumb_portion_p,
-               doc: /* Adjust thumb for overscrolling for Gtk+ and MOTIF.
-Non-nil means adjust the thumb in the scroll bar so it can be dragged downwards
-even if the end of the buffer is shown (i.e. overscrolling).
-Set to nil if you want the thumb to be at the bottom when the end of the buffer
-is shown.  Also, the thumb fills the whole scroll bar when the entire buffer
-is visible.  In this case you can not overscroll.  */);
-  scroll_bar_adjust_thumb_portion_p = 1;
-
   staticpro (&last_mouse_motion_frame);
   last_mouse_motion_frame = Qnil;