auto upstream

24 files changed, 160 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 93c3c333725..f1b134aa8f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac (emacs_config_options): Strip out the (internal)
+        arguments --no-create and --no-recursion.
+
 2013-02-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib, incorporating:
diff --git a/autogen/configure b/autogen/configure
index 4b27e99acf1..1251680b942 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -16239,7 +16239,7 @@ cat >>confdefs.h <<_ACEOF
 #define EMACS_CONFIGURATION "${canonical}"
 _ACEOF
 
-emacs_config_options=`echo "$emacs_config_options" | sed -e "s/\"/'/g"`
+emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g"`
 
 cat >>confdefs.h <<_ACEOF
 #define EMACS_CONFIG_OPTIONS "${emacs_config_options}"
diff --git a/configure.ac b/configure.ac
index c88c6b9577b..7d79db32568 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4148,7 +4148,7 @@ fi
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
                    [Define to the canonical Emacs configuration name.])
 dnl Replace any embedded " characters (bug#13274).
-emacs_config_options=`echo "$emacs_config_options" | sed -e "s/\"/'/g"`
+emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g"`
 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}",
                    [Define to the options passed to configure.])
 AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d2f44eabb0e..bcd9c0c0693 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * trouble.texi (Checklist): Update bug keybinding.
+
 2013-02-09  Eli Zaretskii  <eliz@gnu.org>
 
         * msdog.texi (Text and Binary): Delete the description of
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 97c0ff97530..1c667bc56cb 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -662,7 +662,7 @@ will be sent to the Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.
 (If you want to suggest an improvement or new feature, use the same
 address.)  If you cannot send mail from inside Emacs, you can copy the
 text of your report to your normal mail client (if your system
-supports it, you can type @kbd{C-c m} to have Emacs do this for you)
+supports it, you can type @kbd{C-c M-i} to have Emacs do this for you)
 and send it to that address.  Or you can simply send an email to that
 address describing the problem.
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 90b2349387f..a61d84a77b1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * keymaps.texi (Creating Keymaps): Update make-keymap result.
+
 2013-02-09  Eli Zaretskii  <eliz@gnu.org>
 
         * modes.texi (%-Constructs): Remove the description of %t.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 7c66bbec801..54211d1aa0b 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -327,10 +327,12 @@ these characters to @code{nil}, and does not bind any other kind of
 event.  The argument @var{prompt} specifies a
 prompt string, as in @code{make-sparse-keymap}.
 
+@c This example seems kind of pointless, but I guess it serves
+@c to contrast the result with make-sparse-keymap above.
 @example
 @group
 (make-keymap)
-    @result{} (keymap #^[t nil nil nil @dots{} nil nil keymap])
+    @result{} (keymap #^[nil nil keymap nil nil nil @dots{}])
 @end group
 @end example
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c0a454d31b5..11ff3700da4 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-09  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Basic Operations on Units):
+        (Customizing Calc): Mention the variable `calc-allow-units-as-numbers'.
+
 2013-02-08  Aidan Gauland  <aidalgol@no8wireless.co.nz>
 
         * eshell.texi: Fill most of the missing sections.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index a5514867a99..da018acffe9 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -27866,11 +27866,6 @@ acres per meter-second.)  Remainder units are expressed in terms of
 ``fundamental'' units like @samp{m} and @samp{s}, regardless of the
 input units.
 
-If you want to disallow using inconsistent units, you can set the customizable variable
-@code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}).  In this case,
-if you request units which are inconsistent with the original units, you will be warned about
-it and no conversion will occur.
-
 One special exception is that if you specify a single unit name, and
 a compatible unit appears somewhere in the units expression, then
 that compatible unit will be converted to the new unit and the
@@ -27880,6 +27875,12 @@ change the @samp{s} to @samp{ms} to get @samp{9.8e-4 cm/ms^2}.
 The ``remainder unit'' @samp{cm} is left alone rather than being
 changed to the base unit @samp{m}.
 
+If you want to disallow using inconsistent units, you can set the
+customizable variable @code{calc-ensure-consistent-units} to @code{t}
+(@pxref{Customizing Calc}).  In this case, if you request units which
+are inconsistent with the original units, you will be warned about it
+and no conversion will occur.
+
 You can use explicit unit conversion instead of the @kbd{u s} command
 to gain more control over the units of the result of an expression.
 For example, given @samp{5 m + 23 mm}, you can type @kbd{u c m} or
@@ -27912,10 +27913,16 @@ Composite units are expanded as if by @kbd{a x}, so that
 
 If the value on the stack does not contain any units, @kbd{u c} will
 prompt first for the old units which this value should be considered
-to have, then for the new units.  Assuming the old and new units you
-give are consistent with each other, the result also will not contain
-any units.  For example, @kbd{@w{u c} cm @key{RET} in @key{RET}}
-converts the number 2 on the stack to 5.08.
+to have, then for the new units.  (If the value on the stack can be
+simplified so that it doesn't contain any units, like @samp{ft/in} can
+be simplified to 12, then @kbd{u c} will still prompt for both old
+units and new units. You can ignore the prompt for old units with
+@key{RET}, or turn off the prompt by setting the customizable variable
+@code{calc-allow-units-as-numbers} to @code{nil}. 
+@pxref{Customizing Calc})  Assuming the old and new units you give are
+consistent with each other, the result also will not contain any
+units.  For example, @kbd{@w{u c} cm @key{RET} in @key{RET}} converts
+the number 2 on the stack to 5.08.
 
 @kindex u b
 @pindex calc-base-units
@@ -35694,6 +35701,17 @@ have different dimensions. The default value of @code{calc-ensure-consistent-uni
 is @code{nil}.
 @end defvar
 
+@defvar calc-allow-units-as-numbers
+When converting units, the variable @code{calc-allow-units-as-numbers}
+determines whether or not values which can be simplified so that
+they don't contain units (such as @samp{ft/in} can be simplified to 12)
+can be regarded as not containing units.  If 
+@code{calc-allow-units-as-numbers} is non-@code{nil}, then @kbd{u c}
+will prompt for both old units and new units when converting an expression
+like @samp{ft/in}, otherwise @kbd{u c} will only prompt for the new units.
+The default value of @code{calc-allow-units-as-numbers} is @code{t}.
+@end defvar
+
 @defvar calc-undo-length
 The variable @code{calc-undo-length} determines the number of undo
 steps that Calc will keep track of when @code{calc-quit} is called.
diff --git a/etc/NEWS b/etc/NEWS
index d1723166b6e..91ebe803904 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -436,6 +436,11 @@ The PCL-CVS commands are still available via the keyboard.
 ** Using "unibyte: t" in Lisp source files is obsolete.
 Use "coding: raw-text" instead.
 
+** In the buffer made by `M-x report-emacs-bug', the `C-c m' binding
+has been changed to `C-c M-i' (`report-emacs-bug-insert-to-mailer').
+The previous binding, introduced in Emacs 24.1, was a mistake, because
+`C-c LETTER' bindings are reserved for user customizations.
+
 ** Internationalization
 
 *** New language environment: Persian.
@@ -1262,9 +1267,10 @@ to use the old defaults relying on external mail facilities
 (`sendmail-send-it' on GNU/Linux and other Unix-like systems, and
 `mailclient-send-it' on Windows).
 
-*** Typing C-c m in the buffer made by M-x report-emacs-bug transfers
-the report to your desktop's preferred mail client, if there is one.
-This uses either the "xdg-email" utility, or Mac OS's "open" command.
+*** Typing `C-c m' in the buffer made by `M-x report-emacs-bug'
+transfers the report to your desktop's preferred mail client, if there
+is one.  This uses either the "xdg-email" utility, or Mac OS's "open"
+command.
 
 *** See Changes in Specialized Modes and Packages for SMTPmail changes
 and Mail mode changes
diff --git a/etc/TODO b/etc/TODO
index 4f7b8dc5f0c..912d0746849 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -399,14 +399,6 @@ rather than interactively.  This a trivial one-liner in easy-mode.el.
   Check the assignments file for other packages which might go in and
   have been missed.
 
-** Possibly install python-mode in place of python.el, or combine the two.
-Someone needs to do the work of figuring out who all the non-trivial
-python-mode.el contributors are and getting assignments.
-http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02156.html
-http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02201.html
-http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02489.html
-http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
-
 ** Make keymaps a first-class Lisp object (this means a rewrite of
   keymap.c).  What should it do apart from being opaque ?
   multiple inheritance ?  faster where-is ?  no more fix_submap_inheritance ?
@@ -416,7 +408,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
   an example how to do part of this; see the XMenu* functions on msdos.c.
 
 ** Implement popular parts of the rest of the CL functions as compiler
-  macros in cl-macs.
+  macros in cl-macs.  [Is this still relevant now that cl-lib exists?]
 
 ** Make compiler warnings about functions that might be undefined at run time
  smarter, so that they know which files are required by the file being
@@ -457,7 +449,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
 
 ** Allow unknown image types to be rendered via an external program
   converting them to, say, PBM (in the same way as PostScript?). [does
-  doc-view.el do this, or could it be extended to do this?]
+  doc-view.el do this, or could it be extended to do this?
+  Does ImageMagick obsolete this idea?]
 
 ** Allow displaying an X window from an external program in a buffer,
   e.g. to render graphics from Java applets.  [gerd and/or wmperry
@@ -613,6 +606,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
      There was a special trick to detect mouse press in the lower right
      corner and track mouse movements, but this did not work well, and was
      not scalable to the new Lion "resize on every window edge" behavior.
+     [As of trunk r109635, 2012-08-15, the event loop no longer polls.]
 
 **** (mouse-avoidance-mode 'banish) then minimize Emacs, will pop window back
 up on top of all others
@@ -719,12 +713,6 @@ images with lower bit depth.
 *** Decide what to do with some uncommitted imagemagick support
 functions for image size etc.
 
-*** Test with more systems.
-Tested on Fedora 12, 14, and the libmagick that ships with it.
-I also tried using an ImageMagick compiled from their SVN, in
-parallel with the one packaged by Fedora, it worked well.
-Ubuntu 8.04 was tested, but it seems it ships a broken ImageMagick.
-
 ** nxml mode
 
 *** High priority
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a9af8c42a0..2878db6271f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2013-02-10  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * minibuf-eldef.el (minibuffer-default--in-prompt-regexps): Handle
+        "foo (bar, default: xxx): " prompts.
+
+2013-02-10  Chong Yidong  <cyd@gnu.org>
+
+        * files.el (basic-save-buffer-1): Do not set
+        buffer-file-coding-system-explicit (Bug#4533).
+
+        * mail/emacsbug.el (report-emacs-bug): Change binding of
+        report-emacs-bug-insert-to-mailer to C-c M-i (Bug#13510).
+
+2013-02-09  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc.el (calc-allow-units-as-numbers): New variable.
+        * calc/calc-units.el (calc-convert-units): Use new variable.
+
 2013-02-09  Eli Zaretskii  <eliz@gnu.org>
 
         * subr.el (buffer-file-type, default-buffer-file-type): Remove.
@@ -31,20 +49,19 @@
         (find-file-binary, find-file-text): Bind coding-system-for-read
         instead of file-name-buffer-file-type-alist.
 
-2013-02-09  Tassilo Horn  <tsdh@gnu.org>
+2013-02-09  Jambunathan K  <kjambunathan@gmail.com>
 
         * doc-view.el: Use (and prefer) soffice as default ODF->PDF
-        converter (Bug#13622).  Patch provided by Jambunathan K
-        <kjambunathan@gmail.com>.
-        (doc-view-unoconv-program): Make obsolete variable.
+        converter (Bug#13622).
+        (doc-view-unoconv-program): Make obsolete alias.
         (doc-view-odf->pdf-converter-program): New variable.
         (doc-view-odf->pdf-converter-function): New variable.
         (doc-view-mode-p): Use it.
-        (doc-view-odf->pdf-converter-unoconv): Rename from
-        `doc-view-odf->pdf-converter-unoconv'.
+        (doc-view-odf->pdf-converter-unoconv):
+        Rename from `doc-view-odf->pdf-converter-unoconv'.
         (doc-view-odf->pdf-converter-soffice): New function.
-        (doc-view-convert-current-doc): Use
-        `doc-view-odf->pdf-converter-function'.
+        (doc-view-convert-current-doc):
+        Use `doc-view-odf->pdf-converter-function'.
 
 2013-02-09  Chong Yidong  <cyd@gnu.org>
 
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 72d51d9241c..b334d7b3b45 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -437,17 +437,22 @@ If COMP or STD is non-nil, put that in the units table instead."
                  (list new-units (car default-units))
                  math-default-units-table))))))
 
+(defvar calc-allow-units-as-numbers)
+
 (defun calc-convert-units (&optional old-units new-units)
   (interactive)
   (calc-slow-wrapper
    (let ((expr (calc-top-n 1))
          (uoldname nil)
          (unitscancel nil)
+         (nouold nil)
          unew
          units
          defunits)
      (if (or (not (math-units-in-expr-p expr t))
-             (setq unitscancel (eq (math-get-standard-units expr) 1)))
+             (setq unitscancel (and
+                                calc-allow-units-as-numbers
+                                (eq (math-get-standard-units expr) 1))))
        (let ((uold (or old-units
                        (progn
                          (setq uoldname 
@@ -457,6 +462,7 @@ If COMP or STD is non-nil, put that in the units table instead."
                                  (read-string "Old units: ")))
                          (if (equal uoldname "")
                              (progn
+                               (setq nouold unitscancel)
                                (setq uoldname "1")
                                1)
                            (if (string-match "\\` */" uoldname)
@@ -469,7 +475,7 @@ If COMP or STD is non-nil, put that in the units table instead."
      (unless new-units
        (setq new-units
              (read-string (concat
-                           (if uoldname
+                           (if (and uoldname (not nouold))
                                (concat "Old units: "
                                        uoldname
                                        ", new units")
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index c35e7650254..db30d53d537 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -426,6 +426,14 @@ when converting units."
   :version "24.3"
   :type 'boolean)
 
+(defcustom calc-allow-units-as-numbers
+  t
+  "If non-nil, allow unit expressions to be treated like numbers 
+when converting units, if the expression can be simplified to be unitless."
+  :group 'calc
+  :version "24.4"
+  :type 'boolean)
+
 (defcustom calc-undo-length
   100
   "The number of undo steps that will be preserved when Calc is quit."
diff --git a/lisp/files.el b/lisp/files.el
index 9fca70d36f7..c9e5d2763fe 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4646,9 +4646,7 @@ Before and after saving the buffer, this function runs
             (basic-save-buffer-2))
         (basic-save-buffer-2))
     (if buffer-file-coding-system-explicit
-        (setcar buffer-file-coding-system-explicit last-coding-system-used)
-      (setq buffer-file-coding-system-explicit
-            (cons last-coding-system-used nil)))))
+        (setcar buffer-file-coding-system-explicit last-coding-system-used))))
 
 ;; This returns a value (MODES EXTENDED-ATTRIBUTES BACKUPNAME), like
 ;; backup-buffer.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 57eec01bad5..4c27eea1602 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * nnir.el ("nnir"): Add 'virtual ability to nnir backend.  (This was
+        done in 2012-07-22 by Andrew Cohen, but I reverted it mistakenly.)
+
 2013-02-07  Gábor Vida  <gabor.v.vida@ericsson.com>  (tiny change)
 
         * auth-source.el (auth-source-format-prompt): Don't get confused by
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index e0bfcc2b5f5..0e2e76f25be 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -298,7 +298,7 @@ is `(valuefunc member)'."
 (defvoo nnir-address nil
   "The address of the nnir server.")
 
-(gnus-declare-backend "nnir" 'mail)
+(gnus-declare-backend "nnir" 'mail 'virtual)
 
 
 ;;; User Customizable Variables:
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 995df2fb9a7..47c7087518e 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1132,17 +1132,20 @@ FORM is a form to evaluate to define the coding-system."
       (put (intern name) 'coding-system-define-form form)
       (setq coding-system-alist (cons (list name) coding-system-alist)))))
 
-;; This variable is set in these three cases:
+;; This variable is set in these two cases:
 ;;   (1) A file is read by a coding system specified explicitly.
-;;       after-insert-file-set-coding sets the car of this value to
-;;       coding-system-for-read, and sets the cdr to nil.
-;;   (2) A buffer is saved.
-;;       After writing, basic-save-buffer-1 sets the car of this value
-;;       to last-coding-system-used.
-;;   (3) set-buffer-file-coding-system is called.
+;;       `after-insert-file-set-coding' sets the car of this value to
+;;       `coding-system-for-read', and sets the cdr to nil.
+;;   (2) `set-buffer-file-coding-system' is called.
 ;;       The cdr of this value is set to the specified coding system.
-;; This variable is used for decoding in revert-buffer and encoding in
-;; select-safe-coding-system.
+;; This variable is used for decoding in `revert-buffer' and encoding
+;; in `select-safe-coding-system'.
+;;
+;; When saving a buffer, if `buffer-file-coding-system-explicit' is
+;; already non-nil, `basic-save-buffer-1' sets its CAR to the value of
+;; `last-coding-system-used'.  (It used to set it unconditionally, but
+;; that seems unnecessary; see Bug#4533.)
+
 (defvar buffer-file-coding-system-explicit nil
   "The file coding system explicitly specified for the current buffer.
 The value is a cons of coding systems for reading (decoding) and
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index c35809ef648..c1bc7e2e1ab 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -323,7 +323,7 @@ usually do not have translators for other languages.\n\n")))
     (use-local-map (nconc (make-sparse-keymap) (current-local-map)))
     (define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug)
     (if can-insert-mail
-        (define-key (current-local-map) "\C-cm"
+        (define-key (current-local-map) "\C-c\M-i"
           'report-emacs-bug-insert-to-mailer))
     (setq report-emacs-bug-send-command (get mail-user-agent 'sendfunc)
           report-emacs-bug-send-hook (get mail-user-agent 'hookvar))
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 3826a91f0e0..3b59a9c622a 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -38,6 +38,7 @@
 (defun minibuffer-default--in-prompt-regexps ()
   `(("\\( (default\\(?: is\\)? \\(.*\\))\\):? \\'"
      1 ,(if minibuffer-eldef-shorten-default " [\\2]"))
+    ("([^(]+?\\(, default\\(?: is\\)? \\(.*\\)\\)):? \\'" 1)
     ("\\( \\[.*\\]\\):? *\\'" 1)))
 
 (defcustom minibuffer-eldef-shorten-default nil
diff --git a/src/ChangeLog b/src/ChangeLog
index 05d69382855..9d8540075de 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2013-02-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_vertically_backward, move_it_by_lines): When
+        text lines are longer than window's screen lines, don't move back
+        too far.  This speeds up some redisplay operations.  (Bug#13675)
+
+2013-02-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * syntax.c (scan_sexps_forward): Fix byte position calculation
+        Bug#13664 (a.k.a Bug#13667) introduced with 2013-02-08 change.
+
+2013-02-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Fexpand_file_name): Omit confusing pointer comparison
+        that was not needed.
+
 2013-02-09  Paul Eggert  <eggert@cs.ucla.edu>
 
         Minor hashing refactoring.
diff --git a/src/fileio.c b/src/fileio.c
index 1b293e3a971..ddf23867104 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1348,8 +1348,8 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
 #ifdef WINDOWSNT
             char *prev_o = o;
 #endif
-            while (o != target && (--o) && !IS_DIRECTORY_SEP (*o))
-              ;
+            while (o != target && (--o, !IS_DIRECTORY_SEP (*o)))
+              continue;
 #ifdef WINDOWSNT
             /* Don't go below server level in UNC filenames.  */
             if (o == target + 1 && IS_DIRECTORY_SEP (*o)
diff --git a/src/syntax.c b/src/syntax.c
index 42500b0cb76..390d732944d 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3278,6 +3278,7 @@ do { prev_from = from;				\
 
  stop:   /* Here if stopping before start of sexp. */
   from = prev_from;    /* We have just fetched the char that starts it; */
+  from_byte = prev_from_byte;
   goto done; /* but return the position before it. */
 
  endquoted:
diff --git a/src/xdisp.c b/src/xdisp.c
index 83a58aee32d..5b2eb1e84c8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9046,6 +9046,9 @@ move_it_vertically_backward (struct it *it, int dy)
   struct it it2, it3;
   void *it2data = NULL, *it3data = NULL;
   ptrdiff_t start_pos;
+  int nchars_per_row
+    = (it->last_visible_x - it->first_visible_x) / FRAME_COLUMN_WIDTH (it->f);
+  ptrdiff_t pos_limit;
 
  move_further_back:
   eassert (dy >= 0);
@@ -9054,9 +9057,12 @@ move_it_vertically_backward (struct it *it, int dy)
 
   /* Estimate how many newlines we must move back.  */
   nlines = max (1, dy / FRAME_LINE_HEIGHT (it->f));
+  pos_limit = max (start_pos - nlines * nchars_per_row, BEGV);
 
-  /* Set the iterator's position that many lines back.  */
-  while (nlines-- && IT_CHARPOS (*it) > BEGV)
+  /* Set the iterator's position that many lines back.  But don't go
+     back more than NLINES full screen lines -- this wins a day with
+     buffers which have very long lines.  */
+  while (nlines-- && IT_CHARPOS (*it) > pos_limit)
     back_to_previous_visible_line_start (it);
 
   /* Reseat the iterator here.  When moving backward, we don't want
@@ -9287,6 +9293,9 @@ move_it_by_lines (struct it *it, ptrdiff_t dvpos)
       struct it it2;
       void *it2data = NULL;
       ptrdiff_t start_charpos, i;
+      int nchars_per_row
+        = (it->last_visible_x - it->first_visible_x) / FRAME_COLUMN_WIDTH (it->f);
+      ptrdiff_t pos_limit;
 
       /* Start at the beginning of the screen line containing IT's
          position.  This may actually move vertically backwards,
@@ -9295,9 +9304,11 @@ move_it_by_lines (struct it *it, ptrdiff_t dvpos)
       move_it_vertically_backward (it, 0);
       dvpos -= it->vpos;
 
-      /* Go back -DVPOS visible lines and reseat the iterator there.  */
+      /* Go back -DVPOS buffer lines, but no farther than -DVPOS full
+         screen lines, and reseat the iterator there.  */
       start_charpos = IT_CHARPOS (*it);
-      for (i = -dvpos; i > 0 && IT_CHARPOS (*it) > BEGV; --i)
+      pos_limit = max (start_charpos + dvpos * nchars_per_row, BEGV);
+      for (i = -dvpos; i > 0 && IT_CHARPOS (*it) > pos_limit; --i)
         back_to_previous_visible_line_start (it);
       reseat (it, it->current.pos, 1);