auto upstream

17 files changed, 416 insertions, 184 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5efa7810ad2..eb9f254a5a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,67 @@
+2013-01-25  Alan Mackenzie  <acm@muc.de>
+
+        AWK Mode: Fix indentation bug at top level.  Bug #12274.
+
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Move CASE 5P to
+        just before CASE 5D.
+
+2013-01-25  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * net/socks.el (socks-nslookup-host): Use string-to-number.
+
+2013-01-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-remote-files)
+        (auto-revert-notify-exclude-dir-regexp): New defcustoms.
+        (auto-revert-notify-enabled, auto-revert-use-notify)
+        (auto-revert-notify-watch-descriptor-hash-list)
+        (auto-revert-notify-modified-p, auto-revert-notify-event-p)
+        (auto-revert-notify-event-descriptor)
+        (auto-revert-notify-event-action)
+        (auto-revert-notify-event-file-name): Doc fix.
+        (global-auto-revert-mode): Reorder checks.
+        (auto-revert-notify-rm-watch): Respect changed values of
+        `auto-revert-notify-watch-descriptor-hash-list'.
+        (auto-revert-notify-add-watch): Check for
+        `auto-revert-notify-exclude-dir-regexp'.  Adapt filters for
+        `inotify-add-watch'.  Watch `default-directory' instead of
+        `buffer-file-name'.  `auto-revert-notify-watch-descriptor-hash-list'
+        has a changed meaning now.  (Bug#13540)
+        (auto-revert-notify-handler): Change implementation wrt events
+        returning from a directory.
+        (auto-revert-handler): Reorder implementation for checks of remote
+        files.
+        (auto-revert-buffers): Fix parentheses error.
+
+2013-01-25  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el: Enhancements to header documentation about
+        skeletons.  (Bug#5716)
+
+        * imenu.el (imenu-default-create-index-function): Remove useless
+        infinite loop check.  (Bug#13438)
+
+2013-01-25  Alan Mackenzie  <acm@muc.de>
+
+        Fix a bug in the state cache mechanism.  Refactor this a bit.
+
+        * progmodes/cc-engine.el (c-parse-state-get-strategy): Remove the
+        `cache-pos' element from the return value.
+        (c-append-lower-brace-pair-to-state-cache): "Narrow" to end of
+        buffer to enable proper searching from beyond HERE.  Amend the
+        test for detecting the sought brace pair.  Amend the value written
+        to the "brace desert cache" when the brace isn't found.
+        (c-remove-stale-state-cache): Rename `good-pos' to `start-point',
+        and several other variables analogously.
+        (c-remove-stale-state-cache-backwards): Change `cache-pos' from a
+        parameter to a locally calculated variable.
+        (c-parse-state-1): Change the calling conventions to the two
+        defuns involving `cache-pos'.
+
+2013-01-25  Chong Yidong  <cyd@gnu.org>
+
+        * xml.el (xml-entity-or-char-ref-re): Fix regexp.
+
 2013-01-24  Aaron Ecay <aaronecay@gmail.com>  (tiny change)
 
         * paren.el (show-paren-function): Make sure to set 'priority and
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 1b5460ff2cf..25a953e1719 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -39,8 +39,11 @@
 ;; Auto-Revert Mode applies to all file buffers. (If the user option
 ;; `global-auto-revert-non-file-buffers' is non-nil, it also applies
 ;; to some non-file buffers.  This option is disabled by default.)
-;; Since checking a remote file is too slow, these modes do not check
-;; or revert remote files.
+;;
+;; Since checking a remote file is slow, these modes check or revert
+;; remote files only if the user option `auto-revert-remote-files' is
+;; non-nil.  It is recommended to disable version control for remote
+;; files.
 ;;
 ;; Both modes operate by checking the time stamp of all files at
 ;; intervals of `auto-revert-interval'.  The default is every five
@@ -48,10 +51,12 @@
 ;; Emacs.  You should never even notice that this package is active
 ;; (except that your buffers will be reverted, of course).
 ;;
-;; If Emacs is compiled with file watch support, notifications are
-;; used instead of checking the time stamp of the files.  You can
+;; If Emacs is compiled with file notification support, notifications
+;; are used instead of checking the time stamp of the files.  You can
 ;; disable this by setting the user option `auto-revert-use-notify' to
-;; nil.
+;; nil.  Alternatively, a regular expression of directories to be
+;; excluded from file notifications can be specified by
+;; `auto-revert-notify-exclude-dir-regexp'.
 ;;
 ;; After reverting a file buffer, Auto Revert Mode normally puts point
 ;; at the same position that a regular manual revert would.  However,
@@ -70,7 +75,6 @@
 ;; change by growing at the end.  It only appends the new output,
 ;; instead of reverting the entire buffer.  It does so even if the
 ;; buffer contains unsaved changes.  (Because they will not be lost.)
-;; Auto Revert Tail Mode works also for remote files.
 
 ;; Usage:
 ;;
@@ -260,15 +264,21 @@ buffers.  CPU usage depends on the version control system."
 This variable becomes buffer local when set in any fashion.")
 (make-variable-buffer-local 'global-auto-revert-ignore-buffer)
 
+(defcustom auto-revert-remote-files nil
+  "If non-nil remote files are also reverted."
+  :group 'auto-revert
+  :type 'boolean
+  :version "24.4")
+
 (defconst auto-revert-notify-enabled
   (or (featurep 'inotify) (featurep 'w32notify))
-  "Non-nil when Emacs has been compiled with file watch support.")
+  "Non-nil when Emacs has been compiled with file notification support.")
 
 (defcustom auto-revert-use-notify auto-revert-notify-enabled
-  "If non-nil Auto Revert Mode uses file watch functions.
-This requires Emacs being compiled with file watch support (see
-`auto-revert-notify-enabled').  You should set this variable
-through Custom only."
+  "If non-nil Auto Revert Mode uses file notification functions.
+This requires Emacs being compiled with file notification
+support (see `auto-revert-notify-enabled').  You should set this
+variable through Custom only."
   :group 'auto-revert
   :type 'boolean
   :set (lambda (variable value)
@@ -281,6 +291,17 @@ through Custom only."
                    (auto-revert-notify-rm-watch)))))))
   :version "24.4")
 
+(defcustom auto-revert-notify-exclude-dir-regexp
+  (concat
+   ;; No mounted file systems.
+   "^" (regexp-opt '("/afs/" "/media/" "/mnt" "/net/" "/tmp_mnt/"))
+   ;; No remote files.
+   (unless auto-revert-remote-files "\\|^/[^/|:][^/|]+:"))
+  "Regular expression of directories to be excluded from file notifications."
+  :group 'auto-revert
+  :type 'regexp
+  :version "24.4")
+
 ;; Internal variables:
 
 (defvar auto-revert-buffer-list ()
@@ -306,7 +327,9 @@ the list of old buffers.")
 (defvar auto-revert-notify-watch-descriptor-hash-list
   (make-hash-table :test 'equal)
   "A hash table collecting all file watch descriptors.
-Hash key is a watch descriptor, hash value is the corresponding buffer.")
+Hash key is a watch descriptor, hash value is a list of buffers
+which are related to files being watched and carrying the same
+default directory.")
 
 (defvar auto-revert-notify-watch-descriptor nil
   "The file watch descriptor active for the current buffer.")
@@ -315,7 +338,7 @@ Hash key is a watch descriptor, hash value is the corresponding buffer.")
 
 (defvar auto-revert-notify-modified-p nil
   "Non-nil when file has been modified on the file system.
-This has been reported by a file watch event.")
+This has been reported by a file notification event.")
 (make-variable-buffer-local 'auto-revert-notify-modified-p)
 
 ;; Functions:
@@ -444,9 +467,9 @@ specifies in the mode line."
   (auto-revert-set-timer)
   (if global-auto-revert-mode
       (auto-revert-buffers)
-    (when auto-revert-use-notify
-      (dolist (buf (buffer-list))
-        (with-current-buffer buf
+    (dolist (buf (buffer-list))
+      (with-current-buffer buf
+        (when auto-revert-use-notify
           (auto-revert-notify-rm-watch))))))
 
 (defun auto-revert-set-timer ()
@@ -465,85 +488,106 @@ will use an up-to-date value of `auto-revert-interval'"
                             'auto-revert-buffers))))
 
 (defun auto-revert-notify-rm-watch ()
-  "Disable file watch for current buffer's associated file."
+  "Disable file notification for current buffer's associated file."
   (when auto-revert-notify-watch-descriptor
-    (ignore-errors
-      (funcall (if (fboundp 'inotify-rm-watch)
-                   'inotify-rm-watch 'w32notify-rm-watch)
-               auto-revert-notify-watch-descriptor))
-    (remhash auto-revert-notify-watch-descriptor
-             auto-revert-notify-watch-descriptor-hash-list)
+    (maphash
+     (lambda (key value)
+       (when (equal key auto-revert-notify-watch-descriptor)
+         (setq value (delete (current-buffer) value))
+         (if value
+             (puthash key value auto-revert-notify-watch-descriptor-hash-list)
+           (remhash key auto-revert-notify-watch-descriptor-hash-list)
+           (ignore-errors
+             (funcall (if (fboundp 'inotify-rm-watch)
+                          'inotify-rm-watch 'w32notify-rm-watch)
+                      auto-revert-notify-watch-descriptor)))))
+     auto-revert-notify-watch-descriptor-hash-list)
     (remove-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch))
   (setq auto-revert-notify-watch-descriptor nil
         auto-revert-notify-modified-p nil))
 
 (defun auto-revert-notify-add-watch ()
-  "Enable file watch for current buffer's associated file."
+  "Enable file notification for current buffer's associated file."
+  (when (string-match auto-revert-notify-exclude-dir-regexp
+                      (expand-file-name default-directory))
+    ;; Fallback to file checks.
+    (set (make-local-variable 'auto-revert-use-notify) nil))
+
   (when (and buffer-file-name auto-revert-use-notify
              (not auto-revert-notify-watch-descriptor))
     (let ((func (if (fboundp 'inotify-add-watch)
                     'inotify-add-watch 'w32notify-add-watch))
           (aspect (if (fboundp 'inotify-add-watch)
-                      '(modify) '(size last-write-time))))
+                      '(create modify moved-to) '(size last-write-time))))
       (setq auto-revert-notify-watch-descriptor
             (ignore-errors
               (funcall
-               func buffer-file-name aspect 'auto-revert-notify-handler)))
+               func (directory-file-name (expand-file-name default-directory))
+               aspect 'auto-revert-notify-handler)))
       (if auto-revert-notify-watch-descriptor
           (progn
-            (puthash auto-revert-notify-watch-descriptor
-                     (current-buffer)
-                     auto-revert-notify-watch-descriptor-hash-list)
+            (puthash
+             auto-revert-notify-watch-descriptor
+             (cons (current-buffer)
+                   (gethash auto-revert-notify-watch-descriptor
+                            auto-revert-notify-watch-descriptor-hash-list))
+             auto-revert-notify-watch-descriptor-hash-list)
             (add-hook (make-local-variable 'kill-buffer-hook)
                       'auto-revert-notify-rm-watch))
         ;; Fallback to file checks.
         (set (make-local-variable 'auto-revert-use-notify) nil)))))
 
 (defun auto-revert-notify-event-p (event)
-  "Check that event is a file watch event."
+  "Check that event is a file notification event."
   (cond ((featurep 'inotify)
          (and (listp event) (= (length event) 4)))
         ((featurep 'w32notify)
          (and (listp event) (= (length event) 3) (stringp (nth 2 event))))))
 
 (defun auto-revert-notify-event-descriptor (event)
-  "Return watch descriptor of notification event, or nil."
+  "Return watch descriptor of file notification event, or nil."
   (and (auto-revert-notify-event-p event) (car event)))
 
 (defun auto-revert-notify-event-action (event)
-  "Return action of notification event, or nil."
+  "Return action of file notification event, or nil."
   (and (auto-revert-notify-event-p event) (nth 1 event)))
 
 (defun auto-revert-notify-event-file-name (event)
-  "Return file name of notification event, or nil."
+  "Return file name of file notification event, or nil."
   (and (auto-revert-notify-event-p event)
        (cond ((featurep 'inotify) (nth 3 event))
              ((featurep 'w32notify) (nth 2 event)))))
 
 (defun auto-revert-notify-handler (event)
-  "Handle an event returned from file watch."
+  "Handle an event returned from file notification."
   (when (auto-revert-notify-event-p event)
     (let* ((descriptor (auto-revert-notify-event-descriptor event))
            (action (auto-revert-notify-event-action event))
            (file (auto-revert-notify-event-file-name event))
-           (buffer (gethash descriptor
-                            auto-revert-notify-watch-descriptor-hash-list)))
+           (buffers (gethash descriptor
+                             auto-revert-notify-watch-descriptor-hash-list)))
       (ignore-errors
         ;; Check, that event is meant for us.
         ;; TODO: Filter events which stop watching, like `move' or `removed'.
         (cl-assert descriptor)
-        (when (featurep 'inotify) (cl-assert (memq 'modify action)))
+        (when (featurep 'inotify)
+          (cl-assert (or (memq 'create action)
+                         (memq 'modify action)
+                         (memq 'moved-to action))))
         (when (featurep 'w32notify) (cl-assert (eq 'modified action)))
-        (cl-assert (bufferp buffer))
-        (with-current-buffer buffer
-          (when (and (stringp file) (stringp buffer-file-name))
-            ;; w32notify returns the basename of the file without its
-            ;; leading directories; inotify returns its full absolute
-            ;; file name.
-            (cl-assert (file-equal-p file buffer-file-name)))
-
-          ;; Mark buffer modified.
-          (setq auto-revert-notify-modified-p t))))))
+        ;; Since we watch a directory, a file name must be returned.
+        (cl-assert (stringp file))
+        (dolist (buffer buffers)
+          (when (buffer-live-p buffer)
+            (with-current-buffer buffer
+              (when (and (stringp buffer-file-name)
+                         (string-equal
+                          (file-name-nondirectory file)
+                          (file-name-nondirectory buffer-file-name)))
+                ;; Mark buffer modified.
+                (setq auto-revert-notify-modified-p t)
+                ;; No need to check other buffers.
+                (cl-return)))))))))
 
 (defun auto-revert-active-p ()
   "Check if auto-revert is active (in current buffer or globally)."
@@ -560,23 +604,29 @@ will use an up-to-date value of `auto-revert-interval'"
 This is an internal function used by Auto-Revert Mode."
   (when (or auto-revert-tail-mode (not (buffer-modified-p)))
     (let* ((buffer (current-buffer)) size
+           ;; Tramp caches the file attributes.  Setting
+           ;; `remote-file-name-inhibit-cache' forces Tramp to reread
+           ;; the values.
+           (remote-file-name-inhibit-cache t)
            (revert
             (or (and buffer-file-name
-                     (or (not auto-revert-use-notify)
-                         auto-revert-notify-modified-p)
+                     (or auto-revert-remote-files
+                         (not (file-remote-p buffer-file-name)))
                      (if auto-revert-tail-mode
-                         ;; Tramp caches the file attributes.  Setting
-                         ;; `remote-file-name-inhibit-cache' forces Tramp
-                         ;; to reread the values.
-                         (let ((remote-file-name-inhibit-cache t))
-                           (and (file-readable-p buffer-file-name)
-                                (/= auto-revert-tail-pos
-                                    (setq size
-                                          (nth 7 (file-attributes
-                                                  buffer-file-name))))))
-                       (and (not (file-remote-p buffer-file-name))
-                            (file-readable-p buffer-file-name)
-                            (not (verify-visited-file-modtime buffer)))))
+                         (and (or (not auto-revert-use-notify)
+                                  auto-revert-notify-modified-p)
+                              (file-readable-p buffer-file-name)
+                              (/= auto-revert-tail-pos
+                                  (setq size
+                                        (nth 7 (file-attributes
+                                                buffer-file-name)))))
+                       ;; When `auto-revert-use-notify' is set, we do
+                       ;; not apply further checks for performance
+                       ;; reasons.
+                       (if auto-revert-use-notify
+                           auto-revert-notify-modified-p
+                         (and (file-readable-p buffer-file-name)
+                              (not (verify-visited-file-modtime buffer))))))
                 (and (or auto-revert-mode
                          global-auto-revert-non-file-buffers)
                      revert-buffer-function
@@ -692,10 +742,10 @@ the timer when no buffers need to be checked."
                     (setq auto-revert-buffer-list
                           (delq buf auto-revert-buffer-list)))
                 (when (auto-revert-active-p)
-                  ;; Enable file watches.
+                  ;; Enable file notification.
                   (when (and auto-revert-use-notify buffer-file-name
-                             (not auto-revert-notify-watch-descriptor)
-                      (auto-revert-notify-add-watch)))
+                             (not auto-revert-notify-watch-descriptor))
+                    (auto-revert-notify-add-watch))
                   (auto-revert-handler)))
             ;; Remove dead buffer from `auto-revert-buffer-list'.
             (setq auto-revert-buffer-list
diff --git a/lisp/imenu.el b/lisp/imenu.el
index f64d1afe951..ba0275099a1 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -683,8 +683,6 @@ The alternate method, which is the one most often used, is to call
            (goto-char (point-max))
            ;; Search for the function
            (while (funcall imenu-prev-index-position-function)
-             (when (= pos (point))
-               (error "Infinite loop at %s:%d: imenu-prev-index-position-function does not move point" (buffer-name) pos))
              (setq pos (point))
              (save-excursion
                (setq name (funcall imenu-extract-index-name-function)))
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index 75b0ebe55ff..415397c4171 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -648,7 +648,7 @@ version.")
               (progn
                 (setq res (buffer-substring (match-beginning 2)
                                             (match-end 2))
-                      res (mapcar 'string-to-int (split-string res "\\.")))))
+                      res (mapcar 'string-to-number (split-string res "\\.")))))
           (kill-buffer (current-buffer)))
         res)
     host))
diff --git a/lisp/profiler.el b/lisp/profiler.el
index 9c73fc6e590..73b751c3fcd 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -20,7 +20,7 @@
 
 ;;; Commentary:
 
-;;
+;; See Info node `(elisp)Profiling'.
 
 ;;; Code:
 
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 560b66bf3b0..d4e4d6de483 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2545,14 +2545,12 @@ comment at the start of cc-engine.el for more info."
   ;;
   ;; The return value is a list, one of the following:
   ;;
-  ;; o - ('forward CACHE-POS START-POINT) - scan forward from START-POINT,
-  ;;                                        which is not less than CACHE-POS.
-  ;; o - ('backward CACHE-POS nil) - scan backwards (from HERE).
-  ;; o - ('BOD nil START-POINT) - scan forwards from START-POINT, which is at the
+  ;; o - ('forward START-POINT) - scan forward from START-POINT,
+  ;;     which is not less than the highest position in `c-state-cache' below here.
+  ;; o - ('backward nil) - scan backwards (from HERE).
+  ;; o - ('BOD START-POINT) - scan forwards from START-POINT, which is at the
   ;;   top level.
-  ;; o - ('IN-LIT nil nil) - point is inside the literal containing point-min.
-  ;; , where CACHE-POS is the highest position recorded in `c-state-cache' at
-  ;; or below HERE.
+  ;; o - ('IN-LIT nil) - point is inside the literal containing point-min.
   (let ((cache-pos (c-get-cache-scan-pos here)) ; highest position below HERE in cache (or 1)
         BOD-pos             ; position of 2nd BOD before HERE.
         strategy            ; 'forward, 'backward, 'BOD, or 'IN-LIT.
@@ -2590,7 +2588,6 @@ comment at the start of cc-engine.el for more info."
 
     (list
      strategy
-     (and (memq strategy '(forward backward)) cache-pos)
      (and (memq strategy '(forward BOD)) start-point))))
 
 
@@ -2657,7 +2654,8 @@ comment at the start of cc-engine.el for more info."
   ;; reduce the time wasted in repeated fruitless searches in brace deserts.
   (save-excursion
     (save-restriction
-      (let* (new-cons
+      (let* ((here (point-max))
+             new-cons
              (cache-pos (c-state-cache-top-lparen)) ; might be nil.
              (macro-start-or-from
               (progn (goto-char from)
@@ -2692,6 +2690,7 @@ comment at the start of cc-engine.el for more info."
                 ;; search bound, even though the algorithm below would skip
                 ;; over the new paren pair.
                 (cache-lim (and cache-pos (< cache-pos from) cache-pos)))
+            (widen)
             (narrow-to-region
                 (cond
                  ((and desert-lim cache-lim)
@@ -2711,16 +2710,18 @@ comment at the start of cc-engine.el for more info."
                   (while
                       (and (setq ce (scan-lists bra -1 -1)) ; back past )/]/}; might signal
                            (setq bra (scan-lists ce -1 1)) ; back past (/[/{; might signal
-                           (or (> ce upper-lim)
-                               (not (eq (char-after bra) ?\{))
-                               (and (goto-char bra)
-                                    (c-beginning-of-macro)
-                                    (< (point) macro-start-or-from))))))
+                           (or (> bra here) ;(> ce here)
+                               (and
+                                (< ce here)
+                                (or (not (eq (char-after bra) ?\{))
+                                    (and (goto-char bra)
+                                         (c-beginning-of-macro)
+                                         (< (point) macro-start-or-from))))))))
                 (and ce (< ce bra)))
             (setq bra ce))      ; If we just backed over an unbalanced closing
                                         ; brace, ignore it.
 
-          (if (and ce (< bra ce) (eq (char-after bra) ?\{))
+          (if (and ce (< ce here) (< bra ce) (eq (char-after bra) ?\{))
               ;; We've found the desired brace-pair.
               (progn
                 (setq new-cons (cons bra (1+ ce)))
@@ -2734,7 +2735,11 @@ comment at the start of cc-engine.el for more info."
                  (t (setq c-state-cache (cons new-cons c-state-cache)))))
 
             ;; We haven't found a brace pair.  Record this in the cache.
-            (setq c-state-brace-pair-desert (cons cache-pos from))))))))
+            (setq c-state-brace-pair-desert
+                  (cons (if (and ce (< bra ce) (> ce here)) ; {..} straddling HERE?
+                            bra
+                          (point-min))
+                        (min here from)))))))))
 
 (defsubst c-state-push-any-brace-pair (bra+1 macro-start-or-here)
   ;; If BRA+1 is nil, do nothing.  Otherwise, BRA+1 is the buffer position
@@ -2852,19 +2857,19 @@ comment at the start of cc-engine.el for more info."
        (paren+1)
        (t from)))))
 
-(defun c-remove-stale-state-cache (good-pos pps-point)
+(defun c-remove-stale-state-cache (start-point pps-point)
   ;; Remove stale entries from the `c-cache-state', i.e. those which will
   ;; not be in it when it is amended for position (point-max).
   ;; Additionally, the "outermost" open-brace entry before (point-max)
   ;; will be converted to a cons if the matching close-brace is scanned.
   ;;
-  ;; GOOD-POS is a "maximal" "safe position" - there must be no open
-  ;; parens/braces/brackets between GOOD-POS and (point-max).
+  ;; START-POINT is a "maximal" "safe position" - there must be no open
+  ;; parens/braces/brackets between START-POINT and (point-max).
   ;;
   ;; As a second thing, calculate the result of parse-partial-sexp at
-  ;; PPS-POINT, w.r.t. GOOD-POS.  The motivation here is that
+  ;; PPS-POINT, w.r.t. START-POINT.  The motivation here is that
   ;; `c-state-cache-good-pos' may become PPS-POINT, but the caller may need to
-  ;; adjust it to get outside a string/comment.  (Sorry about this!  The code
+  ;; adjust it to get outside a string/comment.  (Sorry about this!  The code
   ;; needs to be FAST).
   ;;
   ;; Return a list (GOOD-POS SCAN-BACK-POS PPS-STATE), where
@@ -2872,7 +2877,9 @@ comment at the start of cc-engine.el for more info."
   ;;   to be good (we aim for this to be as high as possible);
   ;; o - SCAN-BACK-POS, if not nil, indicates there may be a brace pair
   ;;   preceding POS which needs to be recorded in `c-state-cache'.  It is a
-  ;;   position to scan backwards from.
+  ;;   position to scan backwards from.  It is the position of the "{" of the
+  ;;   last element to be removed from `c-state-cache', when that elt is a
+  ;;   cons, otherwise nil.
   ;; o - PPS-STATE is the parse-partial-sexp state at PPS-POINT.
   (save-restriction
     (narrow-to-region 1 (point-max))
@@ -2882,21 +2889,21 @@ comment at the start of cc-engine.el for more info."
                 (goto-char (point-max))
                 (and (c-beginning-of-macro)
                      (point))))
-             (good-pos-actual-macro-start ; Start of macro containing good-pos
-                                        ; or nil
-              (and (< good-pos (point-max))
+             (start-point-actual-macro-start ; Start of macro containing
+                                             ; start-point or nil
+              (and (< start-point (point-max))
                    (save-excursion
-                     (goto-char good-pos)
+                     (goto-char start-point)
                      (and (c-beginning-of-macro)
                           (point)))))
-             (good-pos-actual-macro-end ; End of this macro, (maybe
+             (start-point-actual-macro-end ; End of this macro, (maybe
                                         ; (point-max)), or nil.
-              (and good-pos-actual-macro-start
+              (and start-point-actual-macro-start
                    (save-excursion
-                     (goto-char good-pos-actual-macro-start)
+                     (goto-char start-point-actual-macro-start)
                      (c-end-of-macro)
                      (point))))
-             pps-state                  ; Will be 9 or 10 elements long.
+             pps-state                  ; Will be 9 or 10 elements long.
              pos
              upper-lim     ; ,beyond which `c-state-cache' entries are removed
              scan-back-pos
@@ -2926,15 +2933,15 @@ comment at the start of cc-engine.el for more info."
         ;; The next loop jumps forward out of a nested level of parens each
         ;; time round; the corresponding elements in `c-state-cache' are
         ;; removed.  `pos' is just after the brace-pair or the open paren at
-        ;; (car c-state-cache).  There can be no open parens/braces/brackets
-        ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max),
+        ;; (car c-state-cache).  There can be no open parens/braces/brackets
+        ;; between `start-point'/`start-point-actual-macro-start' and (point-max),
         ;; due to the interface spec to this function.
-        (setq pos (if (and good-pos-actual-macro-end
-                           (not (eq good-pos-actual-macro-start
+        (setq pos (if (and start-point-actual-macro-end
+                           (not (eq start-point-actual-macro-start
                                     in-macro-start)))
-                      (1+ good-pos-actual-macro-end) ; get outside the macro as
+                      (1+ start-point-actual-macro-end) ; get outside the macro as
                                         ; marked by a `category' text property.
-                    good-pos))
+                    start-point))
         (goto-char pos)
         (while (and c-state-cache
                     (< (point) (point-max)))
@@ -2993,14 +3000,14 @@ comment at the start of cc-engine.el for more info."
 
         (list pos scan-back-pos pps-state)))))
 
-(defun c-remove-stale-state-cache-backwards (here cache-pos)
+(defun c-remove-stale-state-cache-backwards (here)
   ;; Strip stale elements of `c-state-cache' by moving backwards through the
   ;; buffer, and inform the caller of the scenario detected.
   ;;
   ;; HERE is the position we're setting `c-state-cache' for.
-  ;; CACHE-POS is just after the latest recorded position in `c-state-cache'
-  ;;   before HERE, or a position at or near point-min which isn't in a
-  ;;   literal.
+  ;; CACHE-POS (a locally bound variable) is just after the latest recorded
+  ;;   position in `c-state-cache' before HERE, or a position at or near
+  ;;   point-min which isn't in a literal.
   ;;
   ;; This function must only be called only when (> `c-state-cache-good-pos'
   ;; HERE).  Usually the gap between CACHE-POS and HERE is large.  It is thus
@@ -3023,10 +3030,11 @@ comment at the start of cc-engine.el for more info."
   ;; The comments in this defun use "paren" to mean parenthesis or square
   ;; bracket (as contrasted with a brace), and "(" and ")" likewise.
   ;;
-  ;;    .   {..} (..) (..)  ( .. {   }  ) (...)    ( ....          .  ..)
-  ;;    |                   |       |   |     |                    |
-  ;;    CP                  E      here D     C                   good
-  (let ((pos c-state-cache-good-pos)
+  ;;    .   {..} (..) (..)  ( .. {   }  ) (...)    ( ....          .  ..)
+  ;;    |                   |       |   |     |                    |
+  ;;    CP                  E      here D     C                   good
+  (let ((cache-pos (c-get-cache-scan-pos here)) ; highest position below HERE in cache (or 1)
+        (pos c-state-cache-good-pos)
         pa ren         ; positions of "(" and ")"
         dropped-cons ; whether the last element dropped from `c-state-cache'
                      ; was a cons (representing a brace-pair)
@@ -3263,7 +3271,8 @@ comment at the start of cc-engine.el for more info."
          cache-pos           ; highest position below HERE already existing in
                              ; cache (or 1).
          good-pos
-         start-point
+         start-point ; (when scanning forward) a place below HERE where there
+                     ; are no open parens/braces between it and HERE.
          bopl-state
          res
          scan-backward-pos scan-forward-p) ; used for 'backward.
@@ -3274,8 +3283,7 @@ comment at the start of cc-engine.el for more info."
     ;; Strategy?
     (setq res (c-parse-state-get-strategy here c-state-cache-good-pos)
           strategy (car res)
-          cache-pos (cadr res)
-          start-point (nth 2 res))
+          start-point (cadr res))
 
     (when (eq strategy 'BOD)
       (setq c-state-cache nil
@@ -3302,7 +3310,7 @@ comment at the start of cc-engine.el for more info."
                 good-pos)))
 
        ((eq strategy 'backward)
-        (setq res (c-remove-stale-state-cache-backwards here cache-pos)
+        (setq res (c-remove-stale-state-cache-backwards here)
               good-pos (car res)
               scan-backward-pos (cadr res)
               scan-forward-p (car (cddr res)))
@@ -9834,6 +9842,18 @@ comment at the start of cc-engine.el for more info."
             ;; contains any class offset
             )))
 
+         ;; CASE 5P: AWK pattern or function or continuation
+         ;; thereof.
+         ((c-major-mode-is 'awk-mode)
+          (setq placeholder (point))
+          (c-add-stmt-syntax
+           (if (and (eq (c-beginning-of-statement-1) 'same)
+                    (/= (point) placeholder))
+               'topmost-intro-cont
+             'topmost-intro)
+           nil nil
+           containing-sexp paren-state))
+
          ;; CASE 5D: this could be a top-level initialization, a
          ;; member init list continuation, or a template argument
          ;; list continuation.
@@ -9993,18 +10013,6 @@ comment at the start of cc-engine.el for more info."
               (goto-char (point-min)))
           (c-add-syntax 'objc-method-intro (c-point 'boi)))
 
-         ;; CASE 5P: AWK pattern or function or continuation
-         ;; thereof.
-         ((c-major-mode-is 'awk-mode)
-          (setq placeholder (point))
-          (c-add-stmt-syntax
-           (if (and (eq (c-beginning-of-statement-1) 'same)
-                    (/= (point) placeholder))
-               'topmost-intro-cont
-             'topmost-intro)
-           nil nil
-           containing-sexp paren-state))
-
          ;; CASE 5N: At a variable declaration that follows a class
          ;; definition or some other block declaration that doesn't
          ;; end at the closing '}'.  C.f. case 5D.5.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0e5f4c82090..2f353feb323 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -155,7 +155,10 @@
 ;; dabbrev.  If you have `dabbrev-mode' activated and
 ;; `python-skeleton-autoinsert' is set to t, then whenever you type
 ;; the name of any of those defined and hit SPC, they will be
-;; automatically expanded.
+;; automatically expanded.  As an alternative you can use the defined
+;; skeleton commands: `python-skeleton-class', `python-skeleton-def'
+;; `python-skeleton-for', `python-skeleton-if', `python-skeleton-try'
+;; and `python-skeleton-while'.
 
 ;; FFAP: You can find the filename for a given module when using ffap
 ;; out of the box.  This feature needs an inferior python shell
diff --git a/lisp/xml.el b/lisp/xml.el
index b6c37612ab3..2232746f02a 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -200,7 +200,7 @@ See also `xml-get-attribute-or-nil'."
 ;; [68] EntityRef   ::= '&' Name ';'
 (defconst xml-entity-ref (concat "&" xml-name-re ";"))
 
-(defconst xml-entity-or-char-ref-re (concat "&\\(?:#\\(x\\)?\\([0-9]+\\)\\|\\("
+(defconst xml-entity-or-char-ref-re (concat "&\\(?:#\\(x\\)?\\([0-9a-fA-F]+\\)\\|\\("
                                             xml-name-re "\\)\\);"))
 
 ;; [69] PEReference ::= '%' Name ';'
diff --git a/src/ChangeLog b/src/ChangeLog
index ffa4bdf927f..e147889f796 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2013-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32notify.c (Fw32notify_add_watch): Doc fix.  (Bug#13540)
+
+2013-01-25  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * font.c (num_fonts): Remove the leftover from old
+        debugging code.  Adjust comment style here and there.
+        * insdel.c (insert_1): Remove.
+        * lisp.h (insert_1): Remove prototype.
+        * xdisp.c (message_dolog): Adjust users to call insert_1_both.
+
+2013-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (max_filename_mbslen): New function.
+        (normalize_filename, readdir): Use it to detect locales where ANSI
+        encoding of file names uses a double-byte character set (DBCS).
+        If a DBCS encoding is used, advance by characters using
+        CharNextExA, instead of incrementing a 'char *' pointer.  Use
+        _mbslwr instead of _strlwr.  (Bug#13515)
+
+        * w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial
+        request of memory reservation to 1.7GB.  (Bug#13065)
+
+2013-01-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * coding.c (detect_coding_iso_2022): Move back mis-reordered code
+        at check_extra_latin label.  (Bug#13505)
+
 2013-01-24  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * nsfont.m (ns_escape_name, ns_unescape_name, ns_registry_to_script):
@@ -19,7 +48,7 @@
         (w32_read_socket): Save iconified state to generate DEICONIFY_EVENT
         properly.  Likewise for obscured.
         * xterm.c: Ditto.
-        (handle_one_xevent): Save visible state go generate ICONIFY_EVENT
+        (handle_one_xevent): Save visible state to generate ICONIFY_EVENT
         properly.
         * nsterm.m: Ditto.
         (windowDidDeminiaturize): Generate DEICONIFY_EVENT.
diff --git a/src/coding.c b/src/coding.c
index a9bf9032a69..93da9db0d36 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3057,20 +3057,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
             }
           if (single_shifting)
             break;
-        check_extra_latin:
-          if (! VECTORP (Vlatin_extra_code_table)
-              || NILP (AREF (Vlatin_extra_code_table, c)))
-            {
-              rejected = CATEGORY_MASK_ISO;
-              break;
-            }
-          if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
-              & CODING_ISO_FLAG_LATIN_EXTRA)
-            found |= CATEGORY_MASK_ISO_8_1;
-          else
-            rejected |= CATEGORY_MASK_ISO_8_1;
-          rejected |= CATEGORY_MASK_ISO_8_2;
-          break;
+          goto check_extra_latin;
 
         default:
           if (c < 0)
@@ -3121,6 +3108,20 @@ detect_coding_iso_2022 (struct coding_system *coding,
                 }
               break;
             }
+        check_extra_latin:
+          if (! VECTORP (Vlatin_extra_code_table)
+              || NILP (AREF (Vlatin_extra_code_table, c)))
+            {
+              rejected = CATEGORY_MASK_ISO;
+              break;
+            }
+          if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
+              & CODING_ISO_FLAG_LATIN_EXTRA)
+            found |= CATEGORY_MASK_ISO_8_1;
+          else
+            rejected |= CATEGORY_MASK_ISO_8_1;
+          rejected |= CATEGORY_MASK_ISO_8_2;
+          break;
         }
     }
   detect_info->rejected |= CATEGORY_MASK_ISO;
diff --git a/src/font.c b/src/font.c
index 18caf751643..3cffe2558ae 100644
--- a/src/font.c
+++ b/src/font.c
@@ -717,7 +717,7 @@ font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val)
 }
 
 
-/* Font name parser and unparser */
+/* Font name parser and unparser.  */
 
 static int parse_matrix (const char *);
 static int font_expand_wildcards (Lisp_Object *, int);
@@ -1746,7 +1746,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
 /* This part (through the next ^L) is still experimental and not
    tested much.  We may drastically change codes.  */
 
-/* OTF handler */
+/* OTF handler.  */
 
 #if 0
 
@@ -2035,7 +2035,7 @@ font_otf_Anchor (OTF_Anchor *anchor)
 #endif  /* 0 */
 
 
-/* Font sorting */
+/* Font sorting.  */
 
 static unsigned font_score (Lisp_Object, Lisp_Object *);
 static int font_compare (const void *, const void *);
@@ -2565,7 +2565,6 @@ font_get_cache (FRAME_PTR f, struct font_driver *driver)
   return val;
 }
 
-static int num_fonts;
 
 static void
 font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)
@@ -2598,7 +2597,6 @@ font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)
                         {
                           eassert (font && driver == font->driver);
                           driver->close (f, font);
-                          num_fonts--;
                         }
                     }
                   if (driver->free_entity)
@@ -2856,7 +2854,6 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
     return Qnil;
   ASET (entity, FONT_OBJLIST_INDEX,
         Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX)));
-  num_fonts++;
 
   font = XFONT_OBJECT (font_object);
   min_width = (font->min_width ? font->min_width
@@ -2901,7 +2898,6 @@ font_close_object (FRAME_PTR f, Lisp_Object font_object)
   eassert (FRAME_X_DISPLAY_INFO (f)->n_fonts);
   FRAME_X_DISPLAY_INFO (f)->n_fonts--;
 #endif
-  num_fonts--;
 }
 
 
@@ -3578,7 +3574,7 @@ font_filter_properties (Lisp_Object font,
   Lisp_Object it;
   int i;
 
-  /* Set boolean values to Qt or Qnil */
+  /* Set boolean values to Qt or Qnil.  */
   for (i = 0; boolean_properties[i] != NULL; ++i)
     for (it = alist; ! NILP (it); it = XCDR (it))
       {
@@ -3757,7 +3753,7 @@ font_range (ptrdiff_t pos, ptrdiff_t *limit, struct window *w, struct face *face
 #endif
 
 
-/* Lisp API */
+/* Lisp API.  */
 
 DEFUN ("fontp", Ffontp, Sfontp, 1, 2, 0,
        doc: /* Return t if OBJECT is a font-spec, font-entity, or font-object.
diff --git a/src/insdel.c b/src/insdel.c
index 303247816ca..4cf4e6452a1 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -658,17 +658,6 @@ insert_before_markers_and_inherit (const char *string,
     }
 }
 
-/* Subroutine used by the insert functions above.  */
-
-void
-insert_1 (const char *string, ptrdiff_t nbytes,
-          bool inherit, bool prepare, bool before_markers)
-{
-  insert_1_both (string, chars_in_text ((unsigned char *) string, nbytes),
-                 nbytes, inherit, prepare, before_markers);
-}
-
-
 #ifdef BYTE_COMBINING_DEBUG
 
 /* See if the bytes before POS/POS_BYTE combine with bytes
diff --git a/src/lisp.h b/src/lisp.h
index 718c970006c..7128c3d4b18 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2879,7 +2879,6 @@ extern int count_combining_after (const unsigned char *,
                                   ptrdiff_t, ptrdiff_t, ptrdiff_t);
 extern void insert (const char *, ptrdiff_t);
 extern void insert_and_inherit (const char *, ptrdiff_t);
-extern void insert_1 (const char *, ptrdiff_t, bool, bool, bool);
 extern void insert_1_both (const char *, ptrdiff_t, ptrdiff_t,
                            bool, bool, bool);
 extern void insert_from_gap (ptrdiff_t, ptrdiff_t);
diff --git a/src/w32.c b/src/w32.c
index d014609076e..f722bc5f397 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -37,7 +37,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* must include CRT headers *before* config.h */
 
 #include <config.h>
-#include <mbstring.h>   /* for _mbspbrk */
+#include <mbstring.h>   /* for _mbspbrk and _mbslwr */
 
 #undef access
 #undef chdir
@@ -1531,6 +1531,67 @@ srandom (int seed)
   srand (seed);
 }
 
+/* Current codepage for encoding file names.  */
+static int file_name_codepage;
+
+/* Return the maximum length in bytes of a multibyte character
+   sequence encoded in the current ANSI codepage.  This is required to
+   correctly walk the encoded file names one character at a time.  */
+static int
+max_filename_mbslen (void)
+{
+  /* A simple cache to avoid calling GetCPInfo every time we need to
+     normalize a file name.  The file-name encoding is not supposed to
+     be changed too frequently, if ever.  */
+  static Lisp_Object last_file_name_encoding;
+  static int last_max_mbslen;
+  Lisp_Object current_encoding;
+
+  current_encoding = Vfile_name_coding_system;
+  if (NILP (current_encoding))
+    current_encoding = Vdefault_file_name_coding_system;
+
+  if (!EQ (last_file_name_encoding, current_encoding))
+    {
+      CPINFO cp_info;
+
+      last_file_name_encoding = current_encoding;
+      /* Default to the current ANSI codepage.  */
+      file_name_codepage = w32_ansi_code_page;
+      if (!NILP (current_encoding))
+        {
+          char *cpname = SDATA (SYMBOL_NAME (current_encoding));
+          char *cp = NULL, *end;
+          int cpnum;
+
+          if (strncmp (cpname, "cp", 2) == 0)
+            cp = cpname + 2;
+          else if (strncmp (cpname, "windows-", 8) == 0)
+            cp = cpname + 8;
+
+          if (cp)
+            {
+              end = cp;
+              cpnum = strtol (cp, &end, 10);
+              if (cpnum && *end == '\0' && end - cp >= 2)
+                file_name_codepage = cpnum;
+            }
+        }
+
+      if (!file_name_codepage)
+        file_name_codepage = CP_ACP; /* CP_ACP = 0, but let's not assume that */
+
+      if (!GetCPInfo (file_name_codepage, &cp_info))
+        {
+          file_name_codepage = CP_ACP;
+          if (!GetCPInfo (file_name_codepage, &cp_info))
+            emacs_abort ();
+        }
+      last_max_mbslen = cp_info.MaxCharSize;
+    }
+
+  return last_max_mbslen;
+}
 
 /* Normalize filename by converting all path separators to
    the specified separator.  Also conditionally convert upper
@@ -1540,14 +1601,20 @@ static void
 normalize_filename (register char *fp, char path_sep)
 {
   char sep;
-  char *elem;
+  char *elem, *p2;
+  int dbcs_p = max_filename_mbslen () > 1;
 
   /* Always lower-case drive letters a-z, even if the filesystem
      preserves case in filenames.
      This is so filenames can be compared by string comparison
      functions that are case-sensitive.  Even case-preserving filesystems
      do not distinguish case in drive letters.  */
-  if (fp[1] == ':' && *fp >= 'A' && *fp <= 'Z')
+  if (dbcs_p)
+    p2 = CharNextExA (file_name_codepage, fp, 0);
+  else
+    p2 = fp + 1;
+
+  if (*p2 == ':' && *fp >= 'A' && *fp <= 'Z')
     {
       *fp += 'a' - 'A';
       fp += 2;
@@ -1559,7 +1626,10 @@ normalize_filename (register char *fp, char path_sep)
         {
           if (*fp == '/' || *fp == '\\')
             *fp = path_sep;
-          fp++;
+          if (!dbcs_p)
+            fp++;
+          else
+            fp = CharNextExA (file_name_codepage, fp, 0);
         }
       return;
     }
@@ -1582,13 +1652,20 @@ normalize_filename (register char *fp, char path_sep)
         if (elem && elem != fp)
           {
             *fp = 0;            /* temporary end of string */
-            _strlwr (elem);     /* while we convert to lower case */
+            _mbslwr (elem);     /* while we convert to lower case */
           }
         *fp = sep;              /* convert (or restore) path separator */
         elem = fp + 1;          /* next element starts after separator */
         sep = path_sep;
       }
-  } while (*fp++);
+    if (*fp)
+      {
+        if (!dbcs_p)
+          fp++;
+        else
+          fp = CharNextExA (file_name_codepage, fp, 0);
+      }
+  } while (*fp);
 }
 
 /* Destructively turn backslashes into slashes.  */
@@ -2860,15 +2937,22 @@ readdir (DIR *dirp)
     strcpy (dir_static.d_name, dir_find_data.cFileName);
   dir_static.d_namlen = strlen (dir_static.d_name);
   if (dir_is_fat)
-    _strlwr (dir_static.d_name);
+    _mbslwr (dir_static.d_name);
   else if (downcase)
     {
       register char *p;
-      for (p = dir_static.d_name; *p; p++)
-        if (*p >= 'a' && *p <= 'z')
-          break;
+      int dbcs_p = max_filename_mbslen () > 1;
+      for (p = dir_static.d_name; *p; )
+        {
+          if (*p >= 'a' && *p <= 'z')
+            break;
+          if (dbcs_p)
+            p = CharNextExA (file_name_codepage, p, 0);
+          else
+            p++;
+        }
       if (!*p)
-        _strlwr (dir_static.d_name);
+        _mbslwr (dir_static.d_name);
     }
 
   return &dir_static;
diff --git a/src/w32heap.c b/src/w32heap.c
index 9c189dbda6d..81206ce2834 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -98,7 +98,11 @@ allocate_heap (void)
 #ifdef _WIN64
   size_t size = 0x4000000000i64; /* start by asking for 32GB */
 #else
-  size_t size = 0x80000000; /* start by asking for 2GB */
+  /* We used to start with 2GB here, but on Windows 7 that would leave
+     too little room in the address space for threads started by
+     Windows on our behalf, e.g. when we pop up the file selection
+     dialog.  */
+  size_t size = 0x68000000; /* start by asking for 1.7GB */
 #endif
   void *ptr = NULL;
 
diff --git a/src/w32notify.c b/src/w32notify.c
index d78e55f43ed..1bcaa794565 100644
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -442,8 +442,8 @@ DEFUN ("w32notify-add-watch", Fw32notify_add_watch,
 This arranges for filesystem events pertaining to FILE to be reported
 to Emacs.  Use `w32notify-rm-watch' to cancel the watch.
 
-Value is a descriptor for the added watch, or nil if the file
-cannot be watched.
+Value is a descriptor for the added watch.  If the file cannot be
+watched for some reason, this function signals a `file-error' error.
 
 FILTER is a list of conditions for reporting an event.  It can include
 the following symbols:
@@ -476,7 +476,13 @@ following:
   'renamed-from' -- a file was renamed whose old name was FILE
   'renamed-to'   -- a file was renamed and its new name is FILE
 
-FILE is the name of the file whose event is being reported.  */)
+FILE is the name of the file whose event is being reported.
+
+Note that some networked filesystems, such as Samba-mounted Unix
+volumes, might not send notifications about file changes.  In these
+cases, this function will return a valid descriptor, but notifications
+will never come in.  Volumes shared from remote Windows machines do
+generate notifications correctly, though.  */)
   (Lisp_Object file, Lisp_Object filter, Lisp_Object callback)
 {
   Lisp_Object encoded_file, watch_object, watch_descriptor;
diff --git a/src/xdisp.c b/src/xdisp.c
index c7ee0d37f47..9fb9487732f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9516,13 +9516,14 @@ message_dolog (const char *m, ptrdiff_t nbytes, int nlflag, int multibyte)
             }
         }
       else if (nbytes)
-        insert_1 (m, nbytes, 1, 0, 0);
+        insert_1_both (m, chars_in_text (msg, nbytes), nbytes, 1, 0, 0);
 
       if (nlflag)
         {
           ptrdiff_t this_bol, this_bol_byte, prev_bol, prev_bol_byte;
           printmax_t dups;
-          insert_1 ("\n", 1, 1, 0, 0);
+
+          insert_1_both ("\n", 1, 1, 1, 0, 0);
 
           scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0);
           this_bol = PT;
@@ -9551,7 +9552,7 @@ message_dolog (const char *m, ptrdiff_t nbytes, int nlflag, int multibyte)
                          change message_log_check_duplicate.  */
                       int duplen = sprintf (dupstr, " [%"pMd" times]", dups);
                       TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1);
-                      insert_1 (dupstr, duplen, 1, 0, 1);
+                      insert_1_both (dupstr, duplen, duplen, 1, 0, 1);
                     }
                 }
             }