auto upstream

24 files changed, 327 insertions, 268 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index fe61fb4dce1..74f2eb9312b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-20  Glenn Morris  <rgm@gnu.org>
+
+        * display.texi (GIF Images, TIFF Images): Delete these nodes.
+        (ImageMagick Images): For :index, use an xref rather than duplicating.
+        (Other Image Types): Add GIF, adjust formatting.
+        (Multi-Frame Images): Rename from Animated Images.  Expand section.
+        * elisp.texi (Top): Update menu for these changes.
+
 2013-02-19  Glenn Morris  <rgm@gnu.org>
 
         * text.texi (Change Hooks): Fix typo.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index cc6e980dadc..1e596c14233 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4199,14 +4199,12 @@ displayed (@pxref{Display Feature Testing}).
 * Image Descriptors::   How to specify an image for use in @code{:display}.
 * XBM Images::          Special features for XBM format.
 * XPM Images::          Special features for XPM format.
-* GIF Images::          Special features for GIF format.
-* TIFF Images::         Special features for TIFF format.
 * PostScript Images::   Special features for PostScript format.
 * ImageMagick Images::  Special features available through ImageMagick.
 * Other Image Types::   Various other formats are supported.
 * Defining Images::     Convenient ways to define an image for later use.
 * Showing Images::      Convenient ways to display an image once it is defined.
-* Animated Images::     Some image formats can be animated.
+* Multi-Frame Images::  Some images contain more than one frame.
 * Image Cache::         Internal mechanisms of image display.
 @end menu
 
@@ -4541,35 +4539,6 @@ the name of a color as it appears in the image file, and @var{color}
 specifies the actual color to use for displaying that name.
 @end table
 
-@node GIF Images
-@subsection GIF Images
-@cindex GIF
-
-  For GIF images, specify image type @code{gif}.
-
-@table @code
-@item :index @var{index}
-You can use @code{:index} to specify image number @var{index} from a
-GIF file that contains more than one image.  If the GIF file doesn't
-contain an image with the specified index, the image displays as a
-hollow box.  GIF files with more than one image can be animated,
-@pxref{Animated Images}.
-@end table
-
-@node TIFF Images
-@subsection TIFF Images
-@cindex TIFF
-
-  For TIFF images, specify image type @code{tiff}.
-
-@table @code
-@item :index @var{index}
-You can use @code{:index} to specify image number @var{index} from a
-TIFF file that contains more than one image.  If the TIFF file doesn't
-contain an image with the specified index, the image displays as a
-hollow box.
-@end table
-
 @node PostScript Images
 @subsection PostScript Images
 @cindex postscript images
@@ -4653,10 +4622,7 @@ Specifies a rotation angle in degrees.
 
 @item :index
 @c Doesn't work: http://debbugs.gnu.org/7978
-This has the same meaning as it does for GIF images (@pxref{GIF Images}),
-i.e., it specifies which image to view inside an image bundle file format
-such as DJVM@.  You can use the @code{image-metadata} function to
-retrieve the total number of images in an image bundle.
+@xref{Multi-Frame Images}.
 @end table
 
 @node Other Image Types
@@ -4681,13 +4647,27 @@ used for each pixel in the PBM that is 0.  The default is the frame's
 background color.
 @end table
 
-  For JPEG images, specify image type @code{jpeg}.
+@noindent
+The remaining image types that Emacs can support are:
 
-  For TIFF images, specify image type @code{tiff}.
+@table @asis
+@item GIF
+Image type @code{gif}.
+Supports the @code{:index} property.  @xref{Multi-Frame Images}.
+
+@item JPEG
+Image type @code{jpeg}.
 
-  For PNG images, specify image type @code{png}.
+@item PNG
+Image type @code{png}.
 
-  For SVG images, specify image type @code{svg}.
+@item SVG
+Image type @code{svg}.
+
+@item TIFF
+Image type @code{tiff}.
+Supports the @code{:index} property.  @xref{Multi-Frame Images}.
+@end table
 
 @node Defining Images
 @subsection Defining Images
@@ -4923,20 +4903,45 @@ cache, it can always be displayed, even if the value of
 @var{max-image-size} is subsequently changed (@pxref{Image Cache}).
 @end defvar
 
-@node Animated Images
-@subsection Animated Images
+@node Multi-Frame Images
+@subsection Multi-Frame Images
 
 @cindex animation
 @cindex image animation
-Some image files can contain more than one image.  This can be used to
-create animation.  Currently, Emacs only supports animated GIF files.
-The following functions related to animated images are available.
+@cindex image frames
+Some image files can contain more than one image.  We say that there
+are multiple ``frames'' in the image.  At present, Emacs supports
+multiple frames for GIF, TIFF, and certain ImageMagick formats such as
+DJVM@.
+
+The frames can be used either to represent multiple ``pages'' (this is
+usually the case with multi-frame TIFF files, for example), or to
+create animation (usually the case with multi-frame GIF files).
+
+A multi-frame image has a property @code{:index}, whose value is an
+integer (counting from 0) that specifies which frame is being displayed.
+
+@defun image-multi-frame-p image
+This function returns non-@code{nil} if @var{image} contains more than
+one frame.  The actual return value is a cons @code{(@var{nimages}
+. @var{delay})}, where @var{nimages} is the number of frames and
+@var{delay} is the delay in seconds between them, if the image itself
+specifies a delay.  Images that are intended to be animated usually
+specify a frame delay, whereas ones that are intended to be treated as
+multiple pages do not.
+@end defun
+
+@defun image-current-frame image
+This function returns the index of the current frame number for
+@var{image}, counting from 0.
+@end defun
 
-@defun image-animated-p image
-This function returns non-@code{nil} if @var{image} can be animated.
-The actual return value is a cons @code{(@var{nimages} . @var{delay})},
-where @var{nimages} is the number of frames and @var{delay} is the
-delay in seconds between them.
+@defun image-show-frame image n &optional nocheck
+This function switches @var{image} to frame number @var{n}.  It
+replaces a frame number outside the valid range with that of the end
+of the range, unless @var{nocheck} is non-@code{nil}.  If @var{image}
+does not contain a frame with the specified number, the image displays
+as a hollow box.
 @end defun
 
 @defun image-animate image &optional index limit
@@ -4948,7 +4953,9 @@ forever; if a number animation stops after that many seconds.
 @end defun
 
 @noindent Animation operates by means of a timer.  Note that Emacs imposes a
-minimum frame delay of 0.01 seconds.
+minimum frame delay of 0.01 (@code{image-minimum-frame-delay}) seconds.
+If the image itself does not specify a delay, Emacs uses
+@code{image-default-frame-delay}.
 
 @defun image-animate-timer image
 This function returns the timer responsible for animating @var{image},
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 3d1c4cf577d..8ff34941b7d 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -1417,15 +1417,13 @@ Images
 * Image Descriptors::       How to specify an image for use in @code{:display}.
 * XBM Images::              Special features for XBM format.
 * XPM Images::              Special features for XPM format.
-* GIF Images::              Special features for GIF format.
-* TIFF Images::             Special features for TIFF format.
 * PostScript Images::       Special features for PostScript format.
 * ImageMagick Images::      Special features available through ImageMagick.
 * Other Image Types::       Various other formats are supported.
 * Defining Images::         Convenient ways to define an image for later use.
 * Showing Images::          Convenient ways to display an image once
                               it is defined.
-* Animated Images::         Some image formats can be animated.
+* Multi-Frame Images::      Some images contain more than one frame.
 * Image Cache::             Internal mechanisms of image display.
 
 Buttons
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d24f2b593d4..41eb17415b7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-20  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Android shell setup): Improve.  Reported by Thierry
+        Volpiatto <thierry.volpiatto@gmail.com>.
+
 2013-02-16  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Top, Configuration): Insert section `Android shell
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 11f19c8df06..83df411cb23 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -703,14 +703,6 @@ The type symbol @code{real} is a synonym for @code{number}, and
 The type symbols @code{character} and @code{string-char} match
 integers in the range from 0 to 255.
 
-@c No longer relevant, so covered by first item above (float -> floatp).
-@ignore
-@item
-The type symbol @code{float} uses the @code{cl-floatp-safe} predicate
-defined by this package rather than @code{floatp}, so it will work
-correctly even in Emacs versions without floating-point support.
-@end ignore
-
 @item
 The type list @code{(integer @var{low} @var{high})} represents all
 integers between @var{low} and @var{high}, inclusive.  Either bound
@@ -2921,14 +2913,6 @@ This predicate tests whether @var{integer} is even.  It is an
 error if the argument is not an integer.
 @end defun
 
-@ignore
-@defun cl-floatp-safe object
-This predicate tests whether @var{object} is a floating-point
-number.  On systems that support floating-point, this is equivalent
-to @code{floatp}.  On other systems, this always returns @code{nil}.
-@end defun
-@end ignore
-
 @node Numerical Functions
 @section Numerical Functions
 
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 77a4f632cff..807e6b4db29 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2016,7 +2016,7 @@ local machine.
 
 When an @command{sshd} process runs on the Android device, like
 provided by the @code{SSHDroid} app, any @option{ssh}-based method can
-be used.  However, this requires some special settings.
+be used.  This requires some special settings.
 
 The default shell @code{/bin/sh} does not exist.  Instead, you shall
 use just @code{sh}, which invokes the shell installed on the device.
@@ -2031,23 +2031,50 @@ You can instruct @value{tramp} by this form:
 with @samp{192.168.0.26} being the IP address of your Android device.
 
 The user settings for the @code{$PATH} environment variable must be
-preserved.  Add this setting:
+preserved.  It has also been reported, that the commands in
+@file{/system/xbin} are better suited than the ones in
+@file{/system/bin}.  Add these setting:
 
 @lisp
 (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
+(add-to-list 'tramp-remote-path "/system/xbin")
 @end lisp
 
+@noindent
 If the Android device is not @samp{rooted}, you must give the shell a
-writable directory for temporary files.  You could use this setting:
+writable directory for temporary files:
 
 @lisp
 (add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME")
 @end lisp
 
+@noindent
 Now you shall be able to open a remote connection with @kbd{C-x C-f
 @trampfn{ssh, , 192.168.0.26#2222, }}, given that @command{sshd}
 listens on port @samp{2222}.
 
+It is also recommended to add a corresponding entry to your
+@file{~/.ssh/config} for that connection, like
+
+@example
+Host android
+     HostName 192.168.0.26
+     User root
+     Port 2222
+@end example
+
+@noindent
+In this case, you must change the setting for the remote shell to
+
+@lisp
+(add-to-list 'tramp-connection-properties
+             (list (regexp-quote "android") "remote-shell" "sh"))
+@end lisp
+
+@noindent
+You would open the connection with @kbd{C-x C-f @trampfn{ssh, ,
+android, }} then.
+
 
 @node Auto-save and Backup
 @section Auto-save and Backup configuration
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1e75fcdca8..abcf6578060 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2013-02-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (command-execute): Move from C.  Add obsolete check.
+        (extended-command-history): Move from C.
+
+2013-02-20  Ulrich Müller  <ulm@gentoo.org>
+
+        * jka-cmpr-hook.el (jka-compr-compression-info-list)
+        (jka-compr-mode-alist-additions): Handle .txz suffix for
+        XZ-compressed tar archives (bug#13770).
+
+2013-02-20  Bastien Guerry  <bzg@gnu.org>
+
+        * outline.el (outline-regexp, outline-heading-end-regexp):
+        Make variables, not options (bug#13731).
+
+2013-02-20  Glenn Morris  <rgm@gnu.org>
+
+        * image.el (image-current-frame): Change from variable to function.
+        (image-show-frame): Rename from image-nth-frame.  Update callers.
+        * image-mode.el (image-multi-frame): New variable.
+        (image-mode-map, image-mode, image-goto-frame):
+        Use image-multi-frame rather than image-current-frame.
+        (image-mode, image-goto-frame): Use image-current-frame as
+        function rather than as variable.
+
+        * emacs-lisp/cl-lib.el (cl-floatp-safe): Make it an alias for floatp.
+        * emacs-lisp/cl-macs.el (cl--make-type-test)
+        (cl--compiler-macro-assoc): Use floatp rather than cl-floatp-safe.
+
 2013-02-19  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-cache.el (tramp-get-hash-table): New defun.
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 2de8260c941..f3bf70b0190 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -271,11 +271,7 @@ so that they are registered at compile-time as well as run-time."
 
 ;;; Numbers.
 
-(defun cl-floatp-safe (object)
-  "Return t if OBJECT is a floating point number.
-On Emacs versions that lack floating-point support, this function
-always returns nil."
-  (and (numberp object) (not (integerp object))))
+(define-obsolete-function-alias 'cl-floatp-safe 'floatp "24.4")
 
 (defsubst cl-plusp (number)
   "Return t if NUMBER is positive."
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 89e774f830c..40dea8ddebf 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -267,7 +267,7 @@ including `cl-block' and `cl-eval-when'.
 ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
 ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
 ;;;;;;  cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*)
-;;;;;;  "cl-macs" "cl-macs.el" "7614365c56c74e8ed9d098d11801605b")
+;;;;;;  "cl-macs" "cl-macs.el" "b36258e378f078d937e71b70b43fb532")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'cl--compiler-macro-list* "cl-macs" "\
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 8e1f6da3b23..89d022ecced 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2520,7 +2520,7 @@ The type name can then be used in `cl-typecase', `cl-check-type', etc."
             ((memq type '(nil t)) type)
             ((eq type 'null) `(null ,val))
             ((eq type 'atom) `(atom ,val))
-            ((eq type 'float) `(cl-floatp-safe ,val))
+            ((eq type 'float) `(floatp ,val))
             ((eq type 'real) `(numberp ,val))
             ((eq type 'fixnum) `(integerp ,val))
             ;; FIXME: Should `character' accept things like ?\C-\M-a ?  --Stef
@@ -2739,7 +2739,7 @@ surrounded by (cl-block NAME ...).
     (cond ((eq test 'eq) `(assq ,a ,list))
           ((eq test 'equal) `(assoc ,a ,list))
           ((and (macroexp-const-p a) (or (null keys) (eq test 'eql)))
-           (if (cl-floatp-safe (cl--const-expr-val a))
+           (if (floatp (cl--const-expr-val a))
                `(assoc ,a ,list) `(assq ,a ,list)))
           (t form))))
 
@@ -2776,7 +2776,7 @@ surrounded by (cl-block NAME ...).
   (put y 'side-effect-free t))
 
 ;;; Things that are inline.
-(cl-proclaim '(inline cl-floatp-safe cl-acons cl-map cl-concatenate cl-notany
+(cl-proclaim '(inline cl-acons cl-map cl-concatenate cl-notany
                cl-notevery cl--set-elt cl-revappend cl-nreconc gethash))
 
 ;;; Things that are side-effect-free.
@@ -2787,7 +2787,7 @@ surrounded by (cl-block NAME ...).
 
 ;;; Things that are side-effect-and-error-free.
 (mapc (lambda (x) (put x 'side-effect-free 'error-free))
-      '(eql cl-floatp-safe cl-list* cl-subst cl-acons cl-equalp
+      '(eql cl-list* cl-subst cl-acons cl-equalp
         cl-random-state-p copy-tree cl-sublis))
 
 
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 7787a26cc08..6ae1bb20cdc 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -329,6 +329,9 @@ call."
   "The image type for the current Image mode buffer.")
 (make-variable-buffer-local 'image-type)
 
+(defvar-local image-multi-frame nil
+  "Non-nil if image for the current Image mode buffer has multiple frames.")
+
 (defvar image-mode-previous-major-mode nil
   "Internal variable to keep the previous non-image major mode.")
 
@@ -390,7 +393,7 @@ call."
         ["Animate Image" image-toggle-animation :style toggle
          :selected (let ((image (image-get-display-property)))
                      (and image (image-animate-timer image)))
-         :active image-current-frame
+         :active image-multi-frame
          :help "Toggle image animation"]
         ["Loop Animation"
          (lambda () (interactive)
@@ -403,13 +406,13 @@ call."
              (image-toggle-animation)
              (image-toggle-animation)))
          :style toggle :selected image-animate-loop
-         :active image-current-frame
+         :active image-multi-frame
          :help "Animate images once, or forever?"]
-        ["Next Frame" image-next-frame :active image-current-frame
+        ["Next Frame" image-next-frame :active image-multi-frame
          :help "Show the next frame of this image"]
-        ["Previous Frame" image-previous-frame :active image-current-frame
+        ["Previous Frame" image-previous-frame :active image-multi-frame
          :help "Show the previous frame of this image"]
-        ["Goto Frame..." image-goto-frame :active image-current-frame
+        ["Goto Frame..." image-goto-frame :active image-multi-frame
          :help "Show a specific frame of this image"]
         ))
     map)
@@ -471,12 +474,13 @@ to toggle between display as an image and display as text."
            ((null image)
             (message "%s" (concat msg1 "an image.")))
            ((setq animated (image-multi-frame-p image))
-            (setq image-current-frame (or (plist-get (cdr image) :index) 0)
+            (setq image-multi-frame t
                   mode-line-process
-                  `(:eval (propertize (format " [%s/%s]"
-                                              (1+ image-current-frame)
-                                              ,(car animated))
-                                      'help-echo "Frame number")))
+                  `(:eval (propertize
+                           (format " [%s/%s]"
+                                   (1+ (image-current-frame ',image))
+                                   ,(car animated))
+                           'help-echo "Frame number")))
             (message "%s"
                      (concat msg1 "text.  This image has multiple frames.")))
 ;;;                          (substitute-command-keys
@@ -694,10 +698,13 @@ current frame.  Frames are indexed from 1."
     (cond
      ((null image)
       (error "No image is present"))
-     ((null image-current-frame)
+     ((null image-multi-frame)
       (message "No image animation."))
      (t
-      (image-nth-frame image (if relative (+ n image-current-frame) (1- n)))))))
+      (image-show-frame image
+                        (if relative
+                            (+ n (image-current-frame image))
+                          (1- n)))))))
 
 (defun image-next-frame (&optional n)
   "Switch to the next frame of a multi-frame image.
diff --git a/lisp/image.el b/lisp/image.el
index b91d136443d..ec7b41bf126 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -660,10 +660,11 @@ number, play until that number of seconds has elapsed."
 (defconst image-minimum-frame-delay 0.01
   "Minimum interval in seconds between frames of an animated image.")
 
-(defvar-local image-current-frame nil
-  "The frame index of the current animated image.")
+(defun image-current-frame (image)
+  "The current frame number of IMAGE, indexed from 0."
+  (or (plist-get (cdr image) :index) 0))
 
-(defun image-nth-frame (image n &optional nocheck)
+(defun image-show-frame (image n &optional nocheck)
   "Show frame N of IMAGE.
 Frames are indexed from 0.  Optional argument NOCHECK non-nil means
 do not check N is within the range of frames present in the image."
@@ -671,7 +672,6 @@ do not check N is within the range of frames present in the image."
     (if (< n 0) (setq n 0)
       (setq n (min n (1- (car (image-multi-frame-p image)))))))
   (plist-put (cdr image) :index n)
-  (setq image-current-frame n)
   (force-window-update))
 
 ;; FIXME? The delay may not be the same for different sub-images,
@@ -688,7 +688,7 @@ LIMIT determines when to stop.  If t, loop forever.  If nil, stop
  after displaying the last animation frame.  Otherwise, stop
  after LIMIT seconds have elapsed.
 The minimum delay between successive frames is `image-minimum-frame-delay'."
-  (image-nth-frame image n t)
+  (image-show-frame image n t)
   (setq n (1+ n))
   (let* ((time (float-time))
          (animation (image-multi-frame-p image))
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index 7b36f7c1214..851bceccf30 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -234,6 +234,10 @@ options through Custom does this automatically."
      "XZ compressing"     "xz"           ("-c" "-q")
      "XZ uncompressing"   "xz"           ("-c" "-q" "-d")
      t t "\3757zXZ\0"]
+    ["\\.txz\\'"
+     "XZ compressing"     "xz"           ("-c" "-q")
+     "XZ uncompressing"   "xz"           ("-c" "-q" "-d")
+     t nil "\3757zXZ\0"]
     ;; dzip is gzip with random access.  Its compression program can't
     ;; read/write stdin/out, so .dz files can only be viewed without
     ;; saving, having their contents decompressed with gzip.
@@ -302,7 +306,9 @@ variables.  Setting this through Custom does that automatically."
   :group 'jka-compr)
 
 (defcustom jka-compr-mode-alist-additions
-  (list (cons (purecopy "\\.tgz\\'") 'tar-mode) (cons (purecopy "\\.tbz2?\\'") 'tar-mode))
+  (purecopy '(("\\.tgz\\'" . tar-mode)
+              ("\\.tbz2?\\'" . tar-mode)
+              ("\\.txz\\'" . 'tar-mode)))
   "List of pairs added to `auto-mode-alist' when installing jka-compr.
 Uninstalling jka-compr removes all pairs from `auto-mode-alist' that
 installing added.
@@ -315,7 +321,7 @@ variables.  Setting this through Custom does that automatically."
   :set 'jka-compr-set
   :group 'jka-compr)
 
-(defcustom jka-compr-load-suffixes (list (purecopy ".gz"))
+(defcustom jka-compr-load-suffixes (purecopy '(".gz"))
   "List of compression related suffixes to try when loading files.
 Enabling Auto Compression mode appends this list to `load-file-rep-suffixes',
 which see.  Disabling Auto Compression mode removes all suffixes
diff --git a/lisp/outline.el b/lisp/outline.el
index 24f25fd2fb7..0ec5227a286 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -43,25 +43,21 @@
   :prefix "outline-"
   :group 'wp)
 
-(defcustom outline-regexp "[*\^L]+"
+(defvar outline-regexp "[*\^L]+"
   "Regular expression to match the beginning of a heading.
 Any line whose beginning matches this regexp is considered to start a heading.
 Note that Outline mode only checks this regexp at the start of a line,
 so the regexp need not (and usually does not) start with `^'.
 The recommended way to set this is with a Local Variables: list
-in the file it applies to.  See also `outline-heading-end-regexp'."
-  :type 'regexp
-  :group 'outlines)
+in the file it applies to.  See also `outline-heading-end-regexp'.")
 ;;;###autoload(put 'outline-regexp 'safe-local-variable 'stringp)
 
-(defcustom outline-heading-end-regexp "\n"
+(defvar outline-heading-end-regexp "\n"
   "Regular expression to match the end of a heading line.
 You can assume that point is at the beginning of a heading when this
 regexp is searched for.  The heading ends at the end of the match.
 The recommended way to set this is with a `Local Variables:' list
-in the file it applies to."
-  :type 'regexp
-  :group 'outlines)
+in the file it applies to.")
 ;;;###autoload(put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
 
 (defvar outline-mode-prefix-map
diff --git a/lisp/simple.el b/lisp/simple.el
index 138c2420309..3ef700a6058 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1400,6 +1400,8 @@ to get different commands to edit and resubmit."
           (error "Argument %d is beyond length of command history" arg)
         (error "There are no previous complex commands to repeat")))))
 
+(defvar extended-command-history nil)
+
 (defun read-extended-command ()
   "Read command name to invoke in `execute-extended-command'."
   (minibuffer-with-setup-hook
@@ -1489,6 +1491,53 @@ give to the command you invoke, if it asks for an argument."
             (sit-for (if (numberp suggest-key-bindings)
                          suggest-key-bindings
                        2))))))))
+
+(defun command-execute (cmd &optional record-flag keys special)
+  ;; BEWARE: Called directly from the C code.
+  "Execute CMD as an editor command.
+CMD must be a symbol that satisfies the `commandp' predicate.
+Optional second arg RECORD-FLAG non-nil
+means unconditionally put this command in the variable `command-history'.
+Otherwise, that is done only if an arg is read using the minibuffer.
+The argument KEYS specifies the value to use instead of (this-command-keys)
+when reading the arguments; if it is nil, (this-command-keys) is used.
+The argument SPECIAL, if non-nil, means that this command is executing
+a special event, so ignore the prefix argument and don't clear it."
+  (setq debug-on-next-call nil)
+  (let ((prefixarg (unless special
+                     (prog1 prefix-arg
+                       (setq current-prefix-arg prefix-arg)
+                       (setq prefix-arg nil)))))
+    (and (symbolp cmd)
+         (get cmd 'disabled)
+         ;; FIXME: Weird calling convention!
+         (run-hooks 'disabled-command-function))
+    (let ((final cmd))
+      (while
+          (progn
+            (setq final (indirect-function final))
+            (if (autoloadp final)
+                (setq final (autoload-do-load final cmd)))))
+      (cond
+       ((arrayp final)
+        ;; If requested, place the macro in the command history.  For
+        ;; other sorts of commands, call-interactively takes care of this.
+        (when record-flag
+          (push `(execute-kbd-macro ,final ,prefixarg) command-history)
+          ;; Don't keep command history around forever.
+          (when (and (numberp history-length) (> history-length 0))
+            (let ((cell (nthcdr history-length command-history)))
+              (if (consp cell) (setcdr cell nil)))))
+        (execute-kbd-macro final prefixarg))
+       (t
+        ;; Pass `cmd' rather than `final', for the backtrace's sake.
+        (prog1 (call-interactively cmd record-flag keys)
+          (when (and (symbolp cmd)
+                     (get cmd 'byte-obsolete-info)
+                     (not (get cmd 'command-execute-obsolete-warned)))
+            (put cmd 'command-execute-obsolete-warned t)
+            (message "%s" (macroexp--obsolete-warning
+                           cmd (get cmd 'byte-obsolete-info) "command")))))))))
 
 (defvar minibuffer-history nil
   "Default minibuffer history list.
diff --git a/src/ChangeLog b/src/ChangeLog
index ff059cf1a3c..d39336f11e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2013-02-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * sheap.c (report_sheap_usage): Prefer message1_nolog.
+
+        * keyboard.c (Qcommand_execute): New var.
+        (command_loop_1, read_char): Use it.
+        (Fcommand_execute): Remove, replace by an Elisp implementation.
+        (syms_of_keyboard): Adjust accordingly.
+
+2013-02-19  Daniel Colascione <dancol@dancol.org>
+
+        * sheap.c (report_sheap_usage): Use message, not message1, so
+        that we don't try to create a buffer while we're in the middle
+        of dumping Emacs.  Explain why.
+
+2013-02-20  Dmitry Antipov  <dmantipov@yandex.ru>
+        * search.c (find_newline): Return byte position in bytepos.
+        Adjust comment.
+        (find_next_newline_no_quit, find_before_next_newline):
+        Add bytepos argument.
+        * lisp.h (find_newline, find_next_newline_no_quit)
+        (find_before_next_newline): Adjust prototypes.
+        * bidi.c (bidi_find_paragraph_start):
+        * editfns.c (Fconstrain_to_field, Fline_end_position):
+        * indent.c (compute_motion, vmotion):
+        * xdisp.c (back_to_previous_line_start, forward_to_next_line_start):
+        (get_visually_first_element, move_it_vertically_backward):
+        Adjust users and avoid calls to CHAR_TO_BYTE where appropriate.
+
 2013-02-19  Eli Zaretskii  <eliz@gnu.org>
 
         * w32proc.c (new_child): Avoid leaking handles if the subprocess
diff --git a/src/bidi.c b/src/bidi.c
index db2e48a2ca7..364d7e500ba 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1104,14 +1104,11 @@ bidi_find_paragraph_start (ptrdiff_t pos, ptrdiff_t pos_byte)
   while (pos_byte > BEGV_BYTE
          && n++ < MAX_PARAGRAPH_SEARCH
          && fast_looking_at (re, pos, pos_byte, limit, limit_byte, Qnil) < 0)
-    {
-      /* FIXME: What if the paragraph beginning is covered by a
-         display string?  And what if a display string covering some
-         of the text over which we scan back includes
-         paragraph_start_re?  */
-      pos = find_next_newline_no_quit (pos - 1, -1);
-      pos_byte = CHAR_TO_BYTE (pos);
-    }
+    /* FIXME: What if the paragraph beginning is covered by a
+       display string?  And what if a display string covering some
+       of the text over which we scan back includes
+       paragraph_start_re?  */
+    pos = find_next_newline_no_quit (pos - 1, -1, &pos_byte);
   if (n >= MAX_PARAGRAPH_SEARCH)
     pos_byte = BEGV_BYTE;
   return pos_byte;
diff --git a/src/editfns.c b/src/editfns.c
index bee0bcc158d..831c8359fab 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -736,7 +736,7 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil.  */)
                  FIELD_BOUND are on the same line by seeing whether
                  there's an intervening newline or not.  */
               || (find_newline (XFASTINT (new_pos), XFASTINT (field_bound),
-                                fwd ? -1 : 1, &shortage, 1),
+                                fwd ? -1 : 1, &shortage, NULL, 1),
                   shortage != 0)))
         /* Constrain NEW_POS to FIELD_BOUND.  */
         new_pos = field_bound;
@@ -821,7 +821,8 @@ This function does not move point.  */)
     CHECK_NUMBER (n);
 
   clipped_n = clip_to_bounds (PTRDIFF_MIN + 1, XINT (n), PTRDIFF_MAX);
-  end_pos = find_before_next_newline (orig, 0, clipped_n - (clipped_n <= 0));
+  end_pos = find_before_next_newline (orig, 0, clipped_n - (clipped_n <= 0),
+                                      NULL);
 
   /* Return END_POS constrained to the current input field.  */
   return Fconstrain_to_field (make_number (end_pos), make_number (orig),
diff --git a/src/indent.c b/src/indent.c
index ce1639eae1e..9bf75bc6d95 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1328,8 +1328,7 @@ compute_motion (ptrdiff_t from, EMACS_INT fromvpos, EMACS_INT fromhpos,
                  TO (we need to go back below).  */
               if (pos <= to)
                 {
-                  pos = find_before_next_newline (pos, to, 1);
-                  pos_byte = CHAR_TO_BYTE (pos);
+                  pos = find_before_next_newline (pos, to, 1, &pos_byte);
                   hpos = width;
                   /* If we just skipped next_boundary,
                      loop around in the main while
@@ -1583,10 +1582,9 @@ compute_motion (ptrdiff_t from, EMACS_INT fromvpos, EMACS_INT fromhpos,
                           /* Skip any number of invisible lines all at once */
                           do
                             {
-                              pos = find_before_next_newline (pos, to, 1);
+                              pos = find_before_next_newline (pos, to, 1, &pos_byte);
                               if (pos < to)
-                                pos++;
-                              pos_byte = CHAR_TO_BYTE (pos);
+                                INC_BOTH (pos, pos_byte);
                             }
                           while (pos < to
                                  && indented_beyond_p (pos, pos_byte,
@@ -1622,10 +1620,7 @@ compute_motion (ptrdiff_t from, EMACS_INT fromvpos, EMACS_INT fromhpos,
                      everything from a ^M to the end of the line is invisible.
                      Stop *before* the real newline.  */
                   if (pos < to)
-                    {
-                      pos = find_before_next_newline (pos, to, 1);
-                      pos_byte = CHAR_TO_BYTE (pos);
-                    }
+                    pos = find_before_next_newline (pos, to, 1, &pos_byte);
                   /* If we just skipped next_boundary,
                      loop around in the main while
                      and handle it.  */
@@ -1845,21 +1840,20 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w)
 
       while ((vpos > vtarget || first) && from > BEGV)
         {
+          ptrdiff_t bytepos;
           Lisp_Object propval;
 
-          prevline = find_next_newline_no_quit (from - 1, -1);
+          prevline = find_next_newline_no_quit (from - 1, -1, &bytepos);
           while (prevline > BEGV
                  && ((selective > 0
-                      && indented_beyond_p (prevline,
-                                            CHAR_TO_BYTE (prevline),
-                                            selective))
+                      && indented_beyond_p (prevline, bytepos, selective))
                      /* Watch out for newlines with `invisible' property.
                         When moving upward, check the newline before.  */
                      || (propval = Fget_char_property (make_number (prevline - 1),
                                                        Qinvisible,
                                                        text_prop_object),
                          TEXT_PROP_MEANS_INVISIBLE (propval))))
-            prevline = find_next_newline_no_quit (prevline - 1, -1);
+            prevline = find_next_newline_no_quit (prevline - 1, -1, &bytepos);
           pos = *compute_motion (prevline, 0,
                                  lmargin,
                                  0,
@@ -1897,21 +1891,20 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w)
   from_byte = CHAR_TO_BYTE (from);
   if (from > BEGV && FETCH_BYTE (from_byte - 1) != '\n')
     {
+      ptrdiff_t bytepos;
       Lisp_Object propval;
 
-      prevline = find_next_newline_no_quit (from, -1);
+      prevline = find_next_newline_no_quit (from, -1, &bytepos);
       while (prevline > BEGV
              && ((selective > 0
-                  && indented_beyond_p (prevline,
-                                        CHAR_TO_BYTE (prevline),
-                                        selective))
+                  && indented_beyond_p (prevline, bytepos, selective))
                  /* Watch out for newlines with `invisible' property.
                     When moving downward, check the newline after.  */
                  || (propval = Fget_char_property (make_number (prevline),
                                                    Qinvisible,
                                                    text_prop_object),
                      TEXT_PROP_MEANS_INVISIBLE (propval))))
-        prevline = find_next_newline_no_quit (prevline - 1, -1);
+        prevline = find_next_newline_no_quit (prevline - 1, -1, &bytepos);
       pos = *compute_motion (prevline, 0,
                              lmargin,
                              0,
diff --git a/src/keyboard.c b/src/keyboard.c
index 3c00e017498..38136b57b4b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -370,7 +370,7 @@ Lisp_Object Qmenu_bar;
 
 static Lisp_Object recursive_edit_unwind (Lisp_Object buffer);
 static Lisp_Object command_loop (void);
-static Lisp_Object Qextended_command_history;
+static Lisp_Object Qcommand_execute;
 EMACS_TIME timer_check (void);
 
 static void echo_now (void);
@@ -1586,11 +1586,11 @@ command_loop_1 (void)
                   = (EQ (undo, BVAR (current_buffer, undo_list))
                      ? Qnil : BVAR (current_buffer, undo_list));
               }
-            Fcommand_execute (Vthis_command, Qnil, Qnil, Qnil);
+            call1 (Qcommand_execute, Vthis_command);
 
 #ifdef HAVE_WINDOW_SYSTEM
           /* Do not check display_hourglass_p here, because
-             Fcommand_execute could change it, but we should cancel
+             `command-execute' could change it, but we should cancel
              hourglass cursor anyway.
              But don't cancel the hourglass within a macro
              just because a command in the macro finishes.  */
@@ -2845,7 +2845,7 @@ read_char (int commandflag, Lisp_Object map,
     {
       struct buffer *prev_buffer = current_buffer;
       last_input_event = c;
-      Fcommand_execute (tem, Qnil, Fvector (1, &last_input_event), Qt);
+      call4 (Qcommand_execute, tem, Qnil, Fvector (1, &last_input_event), Qt);
 
       if (CONSP (c) && EQ (XCAR (c), Qselect_window) && !end_time)
         /* We stopped being idle for this event; undo that.  This
@@ -9895,95 +9895,6 @@ DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
   return unbind_to (count, Fvector (i, keybuf));
 }
 
-DEFUN ("command-execute", Fcommand_execute, Scommand_execute, 1, 4, 0,
-       doc: /* Execute CMD as an editor command.
-CMD must be a symbol that satisfies the `commandp' predicate.
-Optional second arg RECORD-FLAG non-nil
-means unconditionally put this command in the variable `command-history'.
-Otherwise, that is done only if an arg is read using the minibuffer.
-The argument KEYS specifies the value to use instead of (this-command-keys)
-when reading the arguments; if it is nil, (this-command-keys) is used.
-The argument SPECIAL, if non-nil, means that this command is executing
-a special event, so ignore the prefix argument and don't clear it.  */)
-  (Lisp_Object cmd, Lisp_Object record_flag, Lisp_Object keys, Lisp_Object special)
-{
-  register Lisp_Object final;
-  register Lisp_Object tem;
-  Lisp_Object prefixarg;
-
-  debug_on_next_call = 0;
-
-  if (NILP (special))
-    {
-      prefixarg = KVAR (current_kboard, Vprefix_arg);
-      Vcurrent_prefix_arg = prefixarg;
-      kset_prefix_arg (current_kboard, Qnil);
-    }
-  else
-    prefixarg = Qnil;
-
-  if (SYMBOLP (cmd))
-    {
-      tem = Fget (cmd, Qdisabled);
-      if (!NILP (tem))
-        {
-          tem = Fsymbol_value (Qdisabled_command_function);
-          if (!NILP (tem))
-            return Frun_hooks (1, &Qdisabled_command_function);
-        }
-    }
-
-  while (1)
-    {
-      final = Findirect_function (cmd, Qnil);
-
-      if (CONSP (final) && (tem = Fcar (final), EQ (tem, Qautoload)))
-        {
-          struct gcpro gcpro1, gcpro2;
-
-          GCPRO2 (cmd, prefixarg);
-          Fautoload_do_load (final, cmd, Qnil);
-          UNGCPRO;
-        }
-      else
-        break;
-    }
-
-  if (STRINGP (final) || VECTORP (final))
-    {
-      /* If requested, place the macro in the command history.  For
-         other sorts of commands, call-interactively takes care of
-         this.  */
-      if (!NILP (record_flag))
-        {
-          Vcommand_history
-            = Fcons (Fcons (Qexecute_kbd_macro,
-                            Fcons (final, Fcons (prefixarg, Qnil))),
-                     Vcommand_history);
-
-          /* Don't keep command history around forever.  */
-          if (NUMBERP (Vhistory_length) && XINT (Vhistory_length) > 0)
-            {
-              tem = Fnthcdr (Vhistory_length, Vcommand_history);
-              if (CONSP (tem))
-                XSETCDR (tem, Qnil);
-            }
-        }
-
-      return Fexecute_kbd_macro (final, prefixarg, Qnil);
-    }
-
-  if (CONSP (final) || SUBRP (final) || COMPILEDP (final))
-    /* Don't call Fcall_interactively directly because we want to make
-       sure the backtrace has an entry for `call-interactively'.
-       For the same reason, pass `cmd' rather than `final'.  */
-      return call3 (Qcall_interactively, cmd, record_flag, keys);
-
-  return Qnil;
-}
-
-
-
 /* Return true if input events are pending.  */
 
 bool
@@ -11218,8 +11129,7 @@ syms_of_keyboard (void)
   raw_keybuf = Fmake_vector (make_number (30), Qnil);
   staticpro (&raw_keybuf);
 
-  DEFSYM (Qextended_command_history, "extended-command-history");
-  Fset (Qextended_command_history, Qnil);
+  DEFSYM (Qcommand_execute, "command-execute");
 
   accent_key_syms = Qnil;
   staticpro (&accent_key_syms);
@@ -11258,7 +11168,6 @@ syms_of_keyboard (void)
   defsubr (&Srecursive_edit);
   defsubr (&Strack_mouse);
   defsubr (&Sinput_pending_p);
-  defsubr (&Scommand_execute);
   defsubr (&Srecent_keys);
   defsubr (&Sthis_command_keys);
   defsubr (&Sthis_command_keys_vector);
diff --git a/src/lisp.h b/src/lisp.h
index e7a86892908..7b36878c0c5 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3348,12 +3348,13 @@ extern ptrdiff_t fast_string_match_ignore_case (Lisp_Object, Lisp_Object);
 extern ptrdiff_t fast_looking_at (Lisp_Object, ptrdiff_t, ptrdiff_t,
                                   ptrdiff_t, ptrdiff_t, Lisp_Object);
 extern ptrdiff_t find_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t,
-                               ptrdiff_t *, bool);
+                               ptrdiff_t *, ptrdiff_t *, bool);
 extern EMACS_INT scan_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t,
                                EMACS_INT, bool);
 extern ptrdiff_t find_next_newline (ptrdiff_t, int);
-extern ptrdiff_t find_next_newline_no_quit (ptrdiff_t, ptrdiff_t);
-extern ptrdiff_t find_before_next_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t);
+extern ptrdiff_t find_next_newline_no_quit (ptrdiff_t, ptrdiff_t, ptrdiff_t *);
+extern ptrdiff_t find_before_next_newline (ptrdiff_t, ptrdiff_t,
+                                           ptrdiff_t, ptrdiff_t *);
 extern void syms_of_search (void);
 extern void clear_regexp_cache (void);
 
diff --git a/src/search.c b/src/search.c
index d4508004bf6..1c0f57487f9 100644
--- a/src/search.c
+++ b/src/search.c
@@ -638,15 +638,18 @@ newline_cache_on_off (struct buffer *buf)
    If we don't find COUNT instances before reaching END, set *SHORTAGE
    to the number of newlines left unfound, and return END.
 
+   If BYTEPOS is not NULL, set *BYTEPOS to the byte position corresponding
+   to the returned character position.
+
    If ALLOW_QUIT, set immediate_quit.  That's good to do
    except when inside redisplay.  */
 
 ptrdiff_t
-find_newline (ptrdiff_t start, ptrdiff_t end,
-              ptrdiff_t count, ptrdiff_t *shortage, bool allow_quit)
+find_newline (ptrdiff_t start, ptrdiff_t end, ptrdiff_t count,
+              ptrdiff_t *shortage, ptrdiff_t *bytepos, bool allow_quit)
 {
   struct region_cache *newline_cache;
-  ptrdiff_t end_byte = -1;
+  ptrdiff_t start_byte = -1, end_byte = -1;
   int direction;
 
   if (count > 0)
@@ -680,9 +683,7 @@ find_newline (ptrdiff_t start, ptrdiff_t end,
            the position of the last character before the next such
            obstacle --- the last character the dumb search loop should
            examine.  */
-        ptrdiff_t ceiling_byte = end_byte - 1;
-        ptrdiff_t start_byte;
-        ptrdiff_t tem;
+        ptrdiff_t tem, ceiling_byte = end_byte - 1;
 
         /* If we're looking for a newline, consult the newline cache
            to see where we can avoid some scanning.  */
@@ -745,21 +746,22 @@ find_newline (ptrdiff_t start, ptrdiff_t end,
               if (--count == 0)
                 {
                   immediate_quit = 0;
+                  if (bytepos)
+                    *bytepos = nl + 1 - base + start_byte;
                   return BYTE_TO_CHAR (nl + 1 - base + start_byte);
                 }
               cursor = nl + 1;
             }
 
-          start = BYTE_TO_CHAR (ceiling_addr - base + start_byte);
+          start_byte += ceiling_addr - base;
+          start = BYTE_TO_CHAR (start_byte);
         }
       }
   else
     while (start > end)
       {
         /* The last character to check before the next obstacle.  */
-        ptrdiff_t ceiling_byte = end_byte;
-        ptrdiff_t start_byte;
-        ptrdiff_t tem;
+        ptrdiff_t tem, ceiling_byte = end_byte;
 
         /* Consult the newline cache, if appropriate.  */
         if (newline_cache)
@@ -816,18 +818,26 @@ find_newline (ptrdiff_t start, ptrdiff_t end,
               if (++count >= 0)
                 {
                   immediate_quit = 0;
+                  if (bytepos)
+                    *bytepos = nl - base + start_byte;
                   return BYTE_TO_CHAR (nl - base + start_byte);
                 }
               cursor = nl - 1;
             }
 
-          start = BYTE_TO_CHAR (ceiling_addr - 1 - base + start_byte);
+          start_byte += ceiling_addr - 1 - base;
+          start = BYTE_TO_CHAR (start_byte);
         }
       }
 
   immediate_quit = 0;
-  if (shortage != 0)
+  if (shortage)
     *shortage = count * direction;
+  if (bytepos)
+    {
+      *bytepos = start_byte == -1 ? CHAR_TO_BYTE (start) : start_byte;
+      eassert (*bytepos == CHAR_TO_BYTE (start));
+    }
   return start;
 }
 
@@ -932,9 +942,9 @@ scan_newline (ptrdiff_t start, ptrdiff_t start_byte,
 }
 
 ptrdiff_t
-find_next_newline_no_quit (ptrdiff_t from, ptrdiff_t cnt)
+find_next_newline_no_quit (ptrdiff_t from, ptrdiff_t cnt, ptrdiff_t *bytepos)
 {
-  return find_newline (from, 0, cnt, (ptrdiff_t *) 0, 0);
+  return find_newline (from, 0, cnt, NULL, bytepos, 0);
 }
 
 /* Like find_next_newline, but returns position before the newline,
@@ -942,14 +952,19 @@ find_next_newline_no_quit (ptrdiff_t from, ptrdiff_t cnt)
    find_next_newline (...)-1, because you might hit TO.  */
 
 ptrdiff_t
-find_before_next_newline (ptrdiff_t from, ptrdiff_t to, ptrdiff_t cnt)
+find_before_next_newline (ptrdiff_t from, ptrdiff_t to,
+                          ptrdiff_t cnt, ptrdiff_t *bytepos)
 {
   ptrdiff_t shortage;
-  ptrdiff_t pos = find_newline (from, to, cnt, &shortage, 1);
+  ptrdiff_t pos = find_newline (from, to, cnt, &shortage, bytepos, 1);
 
   if (shortage == 0)
-    pos--;
-
+    {
+      if (bytepos)
+        DEC_BOTH (pos, *bytepos);
+      else
+        pos--;
+    }
   return pos;
 }
 
diff --git a/src/sheap.c b/src/sheap.c
index 06e205bc0e5..28597ec9b65 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -91,5 +91,7 @@ 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);
-  message1 (buf);
+  /* Don't log messages, cause at this point, we're not allowed to create
+     buffers.  */
+  message1_nolog ("%s", buf);
 }
diff --git a/src/xdisp.c b/src/xdisp.c
index 9207355bc09..7a329c5421b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5940,8 +5940,9 @@ pop_it (struct it *it)
 static void
 back_to_previous_line_start (struct it *it)
 {
-  IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1);
-  IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
+  IT_CHARPOS (*it)
+    = find_next_newline_no_quit (IT_CHARPOS (*it) - 1,
+                                 -1, &IT_BYTEPOS (*it));
 }
 
 
@@ -6012,8 +6013,8 @@ forward_to_next_line_start (struct it *it, int *skipped_p,
      short-cut.  */
   if (!newline_found_p)
     {
-      ptrdiff_t start = IT_CHARPOS (*it);
-      ptrdiff_t limit = find_next_newline_no_quit (start, 1);
+      ptrdiff_t bytepos, start = IT_CHARPOS (*it);
+      ptrdiff_t limit = find_next_newline_no_quit (start, 1, &bytepos);
       Lisp_Object pos;
 
       eassert (!STRINGP (it->string));
@@ -6031,7 +6032,7 @@ forward_to_next_line_start (struct it *it, int *skipped_p,
           if (!it->bidi_p)
             {
               IT_CHARPOS (*it) = limit;
-              IT_BYTEPOS (*it) = CHAR_TO_BYTE (limit);
+              IT_BYTEPOS (*it) = bytepos;
             }
           else
             {
@@ -7473,11 +7474,9 @@ get_visually_first_element (struct it *it)
       if (string_p)
         it->bidi_it.charpos = it->bidi_it.bytepos = 0;
       else
-        {
-          it->bidi_it.charpos = find_next_newline_no_quit (IT_CHARPOS (*it),
-                                                           -1);
-          it->bidi_it.bytepos = CHAR_TO_BYTE (it->bidi_it.charpos);
-        }
+        it->bidi_it.charpos
+          = find_next_newline_no_quit (IT_CHARPOS (*it), -1,
+                                       &it->bidi_it.bytepos);
       bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 1);
       do
         {
@@ -9125,7 +9124,7 @@ move_it_vertically_backward (struct it *it, int dy)
           && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
         {
           ptrdiff_t nl_pos =
-            find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1);
+            find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1, NULL);
 
           move_it_to (it, nl_pos, -1, -1, -1, MOVE_TO_POS);
         }