5 files changed, 390 insertions, 679 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 04df41c7d9a..12931661658 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (INFO_INSTALL): Update for 2013-08-28 DOCMISC_W32 change.
+
 2014-06-10  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 62f50af0e43..4e9f8f18526 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -72,7 +72,7 @@ INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
         url vhdl-mode vip viper widget wisent woman
 
 ## Info files to install on current platform.
-INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32)
+INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
 
 ## Info files to build on current platform.
 ## This is all of them, even though they might not all get installed,
diff --git a/etc/NEWS b/etc/NEWS
index 990d3269115..cc29c69a689 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -169,46 +169,38 @@ optional repeat-count argument.
 
 * Installation Changes in Emacs 24.4
 
----
-** Emacs can now be compiled with ACL support.
+** Emacs can now be compiled with ACL (access control list) support.
 This happens by default if a suitable support library is found at
 build time, like libacl on GNU/Linux.  To prevent this, use the
-configure option `--disable-acl'.  See below for related features.
+configure option `--disable-acl'.  See below for the features this provides.
 
----
 ** Emacs can now be compiled with file notification support.
 This happens by default if a suitable system library is found at
 build time.  To prevent this, use the configure option
 `--without-file-notification'.  See below for file-notify features.
 This feature is not available for the Nextstep port.
 
----
 ** Emacs can now be compiled with zlib support.
 This happens by default if zlib is present, which it normally is.
 To prevent this, use the configure option `--without-zlib'.
 This provides the function `zlib-decompress-region'; see below for details.
 
----
 ** The configure option `--without-compress-info' has been generalized,
 and renamed to `--without-compress-install'.  It now prevents compression
 of _any_ files during installation.
 
----
 ** The configure option `--with-crt-dir' has been removed.
 It is no longer needed, as the crt*.o files are no longer linked specially.
 
----
 ** Directories passed to configure option `--enable-locallisppath' are
 no longer created during installation.
 
----
-** Emacs for NS (Mac OS X, GNUstep) can be built with ImageMagick support.
+** Emacs for Nextstep (Mac OS X, GNUstep) can be built with ImageMagick support.
 This requires pkg-config to be available at build time.
 
 
 * Startup Changes in Emacs 24.4
 
-+++
 ** When initializing `load-path', an empty element in the EMACSLOADPATH
 environment variable (either leading, e.g., ":/foo"; trailing, e.g.,
 "/foo:"; or embedded, e.g., "/foo::/bar") is replaced with the default
@@ -218,76 +210,57 @@ This makes it easier to _extend_ the load-path via EMACSLOADPATH
 including the defaults).  (In older versions of Emacs, an empty element
 was replaced by ".", so use an explicit "." now if that is what you want.)
 
-+++
 ** The -L option, which normally prepends its argument to load-path,
 will instead append, if the argument begins with `:' (or `;' on MS Windows;
 i.e., `path-separator').
 
-+++
 ** If you use either site-load.el or site-init.el to customize the dumped
 Emacs executable, any changes to `load-path' that these files make
 will no longer be present after dumping.  To affect a permanent change
 to `load-path', use the `--enable-locallisppath' option of `configure'.
 
-+++
 ** The user option `initial-buffer-choice' can now specify a function
 to set up the initial buffer.
 
 
 * Changes in Emacs 24.4
 
-+++
-** New function `zlib-decompress-region', which decompresses gzip- and
-zlib-format compressed data using built-in zlib support, if available.
+** Support for ACLs (access control lists).
+This requires a suitable support library to be found at build time.
+On GNU/Linux, the POSIX ACL interface is used via libacl.
+On MS-Windows, the NT Security APIs are used to emulate the POSIX interface.
+ACLs are extended file attributes, used e.g. for finer-grained permissions.
 
-+++
-** New option `gnutls-verify-error', if non-nil, means that Emacs
-should reject SSL/TLS certificates that GnuTLS determines as invalid.
-(This option defaults to nil at present, but this is expected to change
-in a future release.)
+*** Emacs preserves the ACL entries of files when backing up.
 
-+++
-** Emacs now supports menus on text-mode terminals.
+*** New functions `file-acl' and `set-file-acl' get and set file ACLs.
+
+** Support for menus on text-mode terminals.
 If the terminal supports a mouse, clicking on the menu bar, or on
 sensitive portions of the mode line or header line, will drop down the
-menu defined at that position.  Likewise, clicking C-mouse-2 or
-C-mouse-2 or C-mouse-3 on the text area will pop up the menus defined
-for those locations.
+menu defined at that position.  Likewise, clicking C-mouse-1, C-mouse-2, or
+C-mouse-3 on the text area will pop up the menus defined for those locations.
 
 If the text terminal does not support a mouse, you can activate the
 first menu-bar menu by typing F10, which invokes `menu-bar-open'.
 
-If you want the previous behavior, whereby F10 invoked `tmm-menubar',
+If you want the previous behavior, where F10 invoked `tmm-menubar',
 customize the option `tty-menu-open-use-tmm' to a non-nil value.
 (Typing M-` always invokes `tmm-menubar', even if `tty-menu-open-use-tmm'
 is nil.)
 
-+++
-** The *Messages* buffer is created in `messages-buffer-mode',
-a new major mode, with read-only status.  Any code that might create
-the *Messages* buffer should call the function `messages-buffer' to do
-so and set up the mode.
-
-+++
-** Emacs can now support ACLs (access control lists).
-This requires a suitable support library to be found at build time.
-On GNU/Linux, the POSIX ACL interface is used via libacl.
-On MS-Windows, the NT Security APIs are used to emulate the POSIX interface.
-
-+++
-*** Emacs preserves the ACL entries of files when backing up.
-+++
-*** New functions `file-acl' and `set-file-acl' get and set the ACL
-entries of a file.
+** New option `load-prefer-newer' affects how the `load' function chooses
+the file to load.  If this is non-nil, then when both .el and .elc
+versions of a file exist, and the caller did not explicitly specify
+which one to load, then the newer file is loaded.  The default, nil,
+means to always load the .elc file.
 
-** Multi-monitor support has been added.
+** Multi-monitor support
 
-+++
 *** New functions `display-monitor-attributes-list' and
 `frame-monitor-attributes' can be used to obtain information about
 each physical monitor on multi-monitor setups.
 
-+++
 *** The functions `display-pixel-width' and `display-pixel-height' now
 behave consistently among the platforms: they return the pixel width
 or height for all physical monitors associated with the given display
@@ -296,31 +269,33 @@ monitor, use the new functions above.  Similar notes also apply to
 `x-display-pixel-width', `x-display-pixel-height', `display-mm-width',
 `display-mm-height', `x-display-mm-width', and `x-display-mm-height'.
 
-+++
-** The cursor stops blinking after 10 blinks (by default) on X and NS.
+** New function `zlib-decompress-region', which decompresses gzip- and
+zlib-format compressed data using built-in zlib support (if available).
+
+** The *Messages* buffer is created in `messages-buffer-mode',
+a new major mode, with read-only status.  Any code that might create
+the *Messages* buffer should call the function `messages-buffer' to do
+so and set up the mode.
+
+** The cursor stops blinking after 10 blinks (by default) on X and Nextstep.
 You can change the default by customizing `blink-cursor-blinks'.
 
-+++
 ** In keymaps where SPC scrolls forward, S-SPC now scrolls backward.
 This affects View mode, etc.
 
-+++
 ** The default value of `make-backup-file-name-function' is no longer nil.
 Instead it defaults to a function that does what the nil value used to.
 
-** Help changes
+** Help
 
-+++
 *** The command `apropos-variable' is renamed to `apropos-user-option'.
-`apropos-user-option' shows all user options while `apropos-variable'
+`apropos-user-option' shows all user options, while `apropos-variable'
 shows all variables.  When called with a universal prefix argument,
 the two commands swap their behaviors.  When `apropos-do-all' is
 non-nil, they output the same results.
 
-+++
 *** The key `?' now describes prefix bindings, like `C-h'.
 
----
 *** The command `describe-function' has been extended for EIEIO.
 Running it on constructors will show a full description of the
 generated class.  For generic functions, it will show all
@@ -328,16 +303,13 @@ implementations together with links to the source.  The old commands
 `describe-class', `describe-constructor' and `describe-generic' were
 removed.
 
----
 *** The function `quail-help' is no longer an interactive command.
 Use `C-h C-\' (`describe-input-method') instead.
 
 ** ImageMagick
 
-+++
 *** ImageMagick images now support the :max-width and :max-height keywords.
 
-+++
 *** When using `create-image' with image data, you can pass a :format
 attribute (via the property-list argument) in order to help
 ImageMagick detect the image type.  The value should be a MIME
@@ -345,21 +317,16 @@ content-type that is found in the new variable `image-format-suffixes'.
 
 ** Frame and window changes
 
-+++
-*** The function `window-in-direction' introduced in Emacs 24.1 now
-takes additional arguments for specifying a reference point, wrapping
-selection around frame borders, and specifying ways to select the
-minibuffer window.
-
-+++
 *** New commands `toggle-frame-fullscreen' and `toggle-frame-maximized',
 bound to <f11> and M-<f10>, respectively.
 
-+++
 *** New hooks `focus-in-hook', `focus-out-hook'.
 These are normal hooks run when an Emacs frame gains or loses input focus.
 
-+++
+*** The function `window-in-direction' now takes additional arguments
+for specifying a reference point, wrapping the selection around frame
+borders, and specifying ways to select the minibuffer window.
+
 *** Emacs can now change frame sizes in units of pixels, rather than
 text rows or columns.  When maximizing a frame or making it fullscreen,
 remaining extra pixels are no longer given to the minibuffer, the rightmost
@@ -368,7 +335,6 @@ areas of the frame's windows.  If the new option `frame-resize-pixelwise'
 is non-nil, all frame size changes happen pixelwise and set the
 corresponding size hints for the window manager.
 
-+++
 *** Emacs can now change window sizes in units of pixels.
 Mouse-dragging a mode line or window divider now changes the size of
 adjacent windows pixelwise.  If the new option `window-resize-pixelwise'
@@ -377,12 +343,10 @@ resize windows pixelwise.  Most functions for changing or accessing
 window sizes now have an additional argument that allows changes to apply,
 or values to be returned, in pixels instead of lines/columns.
 
-+++
 *** The functions `window-body-height' and `window-body-width' now never
 count partially visible lines or columns if called with a nil PIXELWISE
 argument.
 
-+++
 *** Emacs can now draw dividers between adjacent windows.  To put
 dividers between side-by-side/vertically stacked windows customize the
 frame parameters `right-divider-width' and `bottom-divider-width' to
@@ -393,83 +357,67 @@ the appearance of dividers by customizing the faces `window-divider',
 two are useful to provide a 3D effect, or to better distinguish dividers
 from surrounding display objects.
 
-+++
-*** New functions are provided to return the pixel sizes of window
-components, namely `window-scroll-bar-width', `window-mode-line-height'
-`window-header-line-height', `window-right-divider-width' and
+*** New functions to return the pixel sizes of window components, namely
+`window-scroll-bar-width', `window-mode-line-height',
+`window-header-line-height', `window-right-divider-width', and
 `window-bottom-divider-width'.
 
-+++
 *** The new function `window-text-pixel-size' returns the size of the
 text of a window's buffer in pixels.  This allows functions like
 `fit-frame-to-buffer' and `fit-window-to-buffer' to accurately fit a
 window to its buffer as it will be displayed.
 
-+++
 *** `fit-window-to-buffer' can now resize windows in both dimensions.
 This behavior is controlled by the new option
 `fit-window-to-buffer-horizontally'.  The new option
-`fit-frame-to-buffer' allows to fit the window's frame to its buffer.
+`fit-frame-to-buffer' allows you to fit the window's frame to its buffer.
 
-+++
 *** `fit-frame-to-buffer' now fits frames in both dimensions.  The new
 options `fit-frame-to-buffer-margins' and `fit-frame-to-buffer-sizes'
 control the size of the frame and its position on screen.
 
----
-*** Temp Buffer Resize Mode can now adjust height and width of windows
-and frames.  `temp-buffer-resize-mode' is now able to adjust the height
-and the width of a window displaying a temporary buffer.  The new option
-`temp-buffer-max-width' allows to control the width of temporary buffer
-windows.  Moreover, if the new option `fit-frame-to-buffer' is non-nil
-and the buffer appears in the root window of a frame, Temp Buffer Resize
-Mode will try to adjust width and/or height of the frame.
+*** Temp Buffer Resize Mode can now adjust the height and width of
+windows and frames.  The new option `temp-buffer-max-width' allows you to
+control the width of temporary buffer windows.  Moreover, if the new
+option `fit-frame-to-buffer' is non-nil and the buffer appears in the
+root window of a frame, Temp Buffer Resize Mode will try to adjust the
+width and/or height of the frame.
 
----
 *** `split-window' is now a non-interactive function, not a command.
 As a command, it was a special case of `C-x 2' (`split-window-below'),
 and as such superfluous.  After being reimplemented in Lisp, its
 interactive form was mistakenly retained.
 
-+++
 *** The functions `window-size' and `window-total-size' now have an
 optional argument to return a rounded size value.
 
-+++
-*** `window-state-put' now allows to put a window state into internal
+*** `window-state-put' now allows you to put a window state into internal
 windows too.
 
-+++
 *** New option `scroll-bar-adjust-thumb-portion'.
-Available only on X, this option allows to control over-scrolling
-using the scroll bar (i.e. dragging the thumb down even when the end
+Available only on X, this option allows you to control over-scrolling
+using the scroll bar (i.e., dragging the thumb down even when the end
 of the buffer is visible).
 
-+++
-*** New basic action function `display-buffer-in-previous-window' has
-`display-buffer' display a buffer in a window previously showing that
-buffer.
+*** New display actions functions for `display-buffer':
 
-+++
-*** New basic action function `display-buffer-at-bottom' has
-`display-buffer' choose or make a window at the bottom of the selected
-frame.
+**** `display-buffer-in-previous-window' displays a buffer in a window
+previously showing that buffer.
 
-+++
-*** New display action function `display-buffer-no-window' to not
-display the buffer in a window.
+**** `display-buffer-at-bottom' chooses or creates a window at the
+bottom of the selected frame.
+
+**** `display-buffer-no-window' to not display the buffer in a window.
 
-+++
 *** New display action alist entry `allow-no-window' to indicate the
-caller of `display-buffer' is ready to handle the case of not
-displaying the buffer in a window.
+caller of `display-buffer' is ready to handle the case of not displaying
+the buffer in a window.
 
 ** Lisp evaluation changes
-+++
+
 *** `eval-defun' on an already defined defcustom calls the :set function,
 if there is one.
 
-+++
 *** The commands `eval-expression' (`M-:'), `eval-last-sexp' (`C-x C-e'),
 and `eval-print-last-sexp' (`C-j' in Lisp Interaction mode) can take a
 zero prefix argument.  This disables truncation of lists in the output,
@@ -477,214 +425,150 @@ equivalent to setting `(eval-expression-)print-length' and
 `(eval-expression-)print-level' to nil.  Additionally, it causes integers
 to be printed in other formats (octal, hexadecimal, and character).
 
----
 *** New hook `eval-expression-minibuffer-setup-hook' run by
 `eval-expression' on entering the minibuffer.
 
----
-** `write-region-inhibit-fsync' now defaults to t in batch mode.
-
-+++
 ** `cache-long-line-scans' is now non-nil, and renamed to `cache-long-scans',
 because it affects caching of paragraph scanning results as well.
 There is no reason to set this to nil except for debugging purposes.
 
----
-** The option `set-mark-default-inactive' has been deleted.
-This unfinished feature was introduced by accident in Emacs 23.1;
-simply disabling Transient Mark mode does the same thing.
+** `emacs-bzr-version' has been renamed to `emacs-repository-version',
+and works for git too, if you fetch the repository notes.
 
----
 ** The default value of `comment-use-global-state' is now t,
 and this variable has been marked obsolete.
 
----
-** `emacs-bzr-version' has been renamed to `emacs-repository-version',
-and works for git too, if you fetch the repository notes.
+** `write-region-inhibit-fsync' now defaults to t in batch mode.
 
-+++
-** New option `load-prefer-newer' affects how the `load' function chooses
-the file to load.  If this is non-nil, then when both .el and .elc
-versions of a file exist, and the caller did not explicitly specify
-which one to load, then the newer file is loaded.  The default, nil,
-means to always load the .elc file.
+** The option `set-mark-default-inactive' has been deleted.
+This unfinished feature was introduced by accident in Emacs 23.1;
+simply disabling Transient Mark mode does the same thing.
 
 
 * Editing Changes in Emacs 24.4
 
 ** Indentation changes
 
-+++
 *** `electric-indent-mode' is now enabled by default.
 Typing RET reindents the current line and indents the new line.
 `C-j' inserts a newline but does not indent.  In some programming modes,
 additional characters are electric (eg `{').
 
-+++
 *** New buffer-local `electric-indent-local-mode'.
 
-+++
 *** The behavior of `C-x TAB' (`indent-rigidly') has changed.
 When invoked without a prefix argument, it now activates a transient
 mode in which typing <left>, <right>, <S-left>, and <S-right> adjusts
 the text indentation in the region.  Typing any other key resumes
 normal editing behavior.
 
-+++
 *** `tab-stop-list' is now implicitly extended to infinity by repeating
 the last step.  Its default value is changed to nil, which means a tab
 stop every `tab-width' columns.
 
-+++
-** New command `cycle-spacing' acts like a smarter `just-one-space'.
-When called in succession, it cycles between spacing conventions:
-one space, no spaces, original spacing.
-
-+++
-** The new function `fill-single-char-nobreak-p' can stop fill from breaking
-a line after a one-letter word, which is an error in some typographical
-conventions.  To use it, add it to the `fill-nobreak-predicate' hook.
-
-+++
 ** Uniquify is enabled by default, with `post-forward-angle-brackets' style.
 In other words, if you visit two files that have the same base name,
 then rather than creating buffers basename and basename<2>,
 Emacs uses basename<dirA> and basename<dirB>.  To change this,
 customize `uniquify-buffer-name-style'.  Set it to nil for the old behavior.
 
-+++
 ** New command `C-x SPC' (`rectangle-mark-mode') makes a rectangular region.
 Most commands are still unaware of it, but kill/yank do work on the rectangle.
 
-+++
 ** New option `visual-order-cursor-movement'.
 If this is non-nil, cursor motion with arrow keys will follow the
 visual order of characters on the screen: <left> always moves to the
 left, <right> always moves to the right, disregarding the surrounding
 bidirectional context.
 
-** Register changes
+** New command `delete-duplicate-lines'.
+This searches the region for identical lines, and removes all but one
+copy of each repeated line.  The lines need not be sorted.
+
+** New command `cycle-spacing' acts like a smarter `just-one-space'.
+When called in succession, it cycles between spacing conventions:
+one space, no spaces, original spacing.
+
+** `blink-matching-paren' now only highlights the matching open-paren
+by default, instead of moving the cursor.  Set this variable to `jump' to
+restore the old behavior.
+
+** The new function `fill-single-char-nobreak-p' can stop fill from breaking
+a line after a one-letter word, which is an error in some typographical
+conventions.  To use it, add it to the `fill-nobreak-predicate' hook.
+
+** Registers
 
-+++
 *** All interactive commands that read a register (`copy-to-register', etc.)
 now display a temporary window after `register-preview-delay' seconds
 that summarizes existing registers.  To disable this, set that option to nil.
 Interactive commands that read registers and want to make use of this
 should use `register-read-with-preview' to read register names.
 
-+++
 *** New command `frameset-to-register' bound to `C-x r f', replacing
 `frame-configuration-to-register'.  It offers similar functionality,
 plus enhancements like the ability to restore deleted frames.
 (`frame-configuration-to-register' still exists, but no longer has a
 key binding.)
 
-+++
 *** New command `C-x C-k x' (`kmacro-to-register') stores keyboard
 macros in registers.
 
-+++
-** New command `delete-duplicate-lines'.
-This searches the region for identical lines, and removes all but one
-copy of each repeated line.  The lines need not be sorted.
-
-+++
-** `blink-matching-paren' now only highlights the matching open-paren
-by default, instead of moving cursor.  Set this variable to `jump' to
-enable the old behavior.
-
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
-+++
-** More packages look for ~/.emacs.d/<foo> additionally to ~/.<foo>.
-Affected files:
-~/.emacs.d/timelog      replaces  ~/.timelog
-~/.emacs.d/vip          replaces  ~/.vip
-~/.emacs.d/viper        replaces  ~/.viper
-~/.emacs.d/ido.last     replaces  ~/.ido.last
-~/.emacs.d/kkcrc        replaces  ~/.kkcrc
-~/.emacs.d/quickurls    replaces  ~/.quickurls
-~/.emacs.d/idlwave/     replaces  ~/.idlwave/
-~/.emacs.d/bdfcache.el  replaces  ~/.bdfcache.el
-~/.emacs.d/places       replaces  ~/.emacs-places
-~/.emacs.d/shadows      replaces  ~/.shadows
-~/.emacs.d/shadow_todo  replaces  ~/.shadow_todo
-~/.emacs.d/strokes      replaces  ~/.strokes
-~/.emacs.d/notes        replaces  ~/.notes
-~/.emacs.d/type-break   replaces  ~/.type-break
-Also the following files used by the now obsolete otodo-mode.el:
-~/.emacs.d/todo-do      replaces  ~/.todo-do
-~/.emacs.d/todo-done    replaces  ~/.todo-done
-~/.emacs.d/todo-top     replaces  ~/.todo-top
-
 ** Backtrace and debugger
 
-+++
 *** New Lisp debugger command `v' (`debugger-toggle-locals') toggles the
 display of local variables of the current stack frame.
 
-+++
 *** The Lisp debugger's `e' command (`debugger-eval-expression') now includes
 the lexical environment when evaluating the code in the context at point
 (and so allows you to access lexical variables).
 
----
 *** New minor mode `jit-lock-debug-mode' helps you debug code run via JIT Lock.
 
----
 ** Battery information can now be retrieved from BSD's `apm' utility.
 
----
 ** In the Buffer Menu, `M-s a C-o' shows matches for a regexp in marked buffers.
 
-** Calendar and Diary
-
----
-*** New faces `calendar-weekday-header', `calendar-weekend-header',
-and `calendar-month-header'.
-
-+++
-*** New option `calendar-day-header-array'.
-
-+++
-*** New variable `diary-from-outlook-function', used by the command
-`diary-from-outlook'.
-
----
-*** The variable `calendar-font-lock-keywords' is obsolete.
-
 ** Calc
 
-+++
 *** Calc by default now uses the Gregorian calendar for all dates, and
 uses January 1, 1 AD as its day number 1.  Previously Calc used the
 Julian calendar for dates before September 14, 1752, and it used
 December 31, 1 BC as its day number 1; the new scheme is more
 consistent with Calendar's calendrical system and day numbering.
 
-+++
 *** The new option `calc-gregorian-switch' lets you configure if
 (and when) Calc switches from the Julian to the Gregorian calendar.
 
-+++
 *** Support for ISO 8601 dates.
 
+** Calendar and Diary
+
+*** New faces `calendar-weekday-header', `calendar-weekend-header',
+and `calendar-month-header'.
+
+*** New option `calendar-day-header-array'.
+
+*** New variable `diary-from-outlook-function', used by the command
+`diary-from-outlook'.
+
+*** The variable `calendar-font-lock-keywords' is obsolete.
+
 ** CEDET
 
 *** EDE
 
-+++
 **** The cpp-root project now supports executing a compile command.
 It can be set through the new :compile-command slot or the
 buffer-local variable `compile-command'.
 
-+++
 **** Better selection of include directories for the 'linux' project.
 Include directories now support out-of-tree build directories and
 target architecture auto-detection.
 
----
 *** Semantic
 
 **** Improved detection of used namespaces in current scope in C++.
@@ -700,119 +584,97 @@ For example, this enables parsing of macros that open new namespaces.
 
 **** Support for 'this' pointer in inline member functions in C++.
 
+** CFEngine mode
+
+*** Support for completion, ElDoc, and Flycheck has been added.
+
+*** The current CFEngine syntax is parsed from "cf-promises -s json".
+There is a fallback syntax available if you don't have cf-promises or
+if your version doesn't support that option.  See option `cfengine-cf-promises'.
+
 ** cl-lib
 
-+++
 *** New macro `cl-tagbody'.
 This executes statements while allowing for control transfer to labels.
 
-+++
 *** letf is now just an alias for cl-letf.
 
 ** CUA mode
 
-+++
 *** CUA mode now uses `delete-selection-mode' and `shift-select-mode'.
 Hence, you can now enable it independently from those modes, and from
 `transient-mark-mode'.
 
----
 *** `cua-highlight-region-shift-only' is now obsolete.
 You can disable `transient-mark-mode' to get the same result.
 
-+++
 *** CUA's rectangles can now be used without CUA by calling the command
 `cua-rectangle-mark-mode'.
 
-** CFEngine mode
-
----
-*** Support for completion, ElDoc, and Flycheck has been added.
-
----
-*** The current CFEngine syntax is parsed from "cf-promises -s json".
-There is a fallback syntax available if you don't have cf-promises or
-if your version doesn't support that option.  See option `cfengine-cf-promises'.
-
----
 ** Delete Selection mode can now be used without Transient Mark mode.
 
 ** Desktop
 
-+++
 *** `desktop-save-mode' by default now auto-saves an existing desktop file
 after `desktop-auto-save-timeout'.  To disable this, customize that option
 to nil (or zero).
 
-+++
 *** Desktop now saves and restores the frame/window configuration.
 To disable this, set `desktop-restore-frames' to nil.
 See also related options `desktop-restore-reuses-frames',
 `desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'.
 
-+++
 ** New Dired minor mode `dired-hide-details-mode' toggles whether details,
 such as file ownership or permissions, are visible in Dired buffers.
 See the new options `dired-hide-details-hide-symlink-targets' and
 `dired-hide-details-hide-information-lines' for customizing what to hide.
 
----
 ** You can enable ElDoc inside the `eval-expression' minibuffer with:
   (add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-mode)
 The results display in the mode line.
 
 ** Electric Pair mode
 
-+++
 *** New option `electric-pair-preserve-balance', enabled by default.
 If non-nil, pairing/skipping only kicks in when that help the balance
-of parentheses and quotes, i.e. the buffer should end up at least as
+of parentheses and quotes; i.e., the buffer should end up at least as
 balanced as before.
 
 You can further control this behavior by adjusting the predicates
 stored in `electric-pair-inhibit-predicate' and `electric-pair-skip-self'.
 
-+++
 *** New option `electric-pair-delete-adjacent-pairs', enabled by default.
 In `electric-pair-mode', the commands `backward-delete-char' and
 `backward-delete-char-untabify' are now bound to electric variants
 that delete the closer when invoked between adjacent pairs.
 
-+++
 *** New option `electric-pair-open-newline-between-pairs', enabled by default.
 In `electric-pair-mode', inserting a newline between adjacent pairs
 opens an extra newline after point, which is indented if
 `electric-indent-mode' is also set.
 
-+++
 *** New option `electric-pair-skip-whitespace', enabled by default.
 This controls if skipping over closing delimiters should jump over any
 whitespace slack.  Setting it to `chomp' makes it delete this
 whitespace.  See also the variable `electric-pair-skip-whitespace-chars'.
 
----
 *** New variables control the pairing in strings and comments.
 You can customize `electric-pair-text-pairs' and
 `electric-pair-text-syntax-table' to tweak pairing behavior inside
 strings and comments.
 
-+++
 ** New EPA option `epa-mail-aliases'.
 You can set this to a list of email address aliases that `epa-mail-encrypt'
 should use to find keys.
 
----
 ** New ERC option `erc-accidental-paste-threshold-seconds'.
 If set to a number, this can be used to avoid accidentally pasting large
 amounts of data into the ERC input.
 
-+++
 ** New ERT macro `skip-unless' allows skipping ERT tests.
-See the ERT manual for details.
 
 ** Eshell
 
-+++
 *** `eshell' now supports visual subcommands and options.
 Eshell has been able to handle "visual" commands (interactive,
 non-line oriented commands such as top that require display
@@ -822,121 +684,100 @@ terminal emulator.  See `eshell-visual-commands'.
 This feature has been extended to subcommands and options that make a
 usually line-oriented command a visual command.  Typical examples are
 "git log" and "git <command> --help", which display their output in a
-pager by default.  See `eshell-visual-subcommands' and
-`eshell-visual-options'.
+pager by default.  See `eshell-visual-subcommands' and `eshell-visual-options'.
 
----
 *** New Eshell-Tramp module.
 External su and sudo commands are now the default; the internal,
-Tramp-using variants can still be used by enabling the eshell-tramp
-module.
+Tramp-using variants can still be used by enabling the eshell-tramp module.
 
----
 ** New F90 mode option `f90-smart-end-names'.
 
+** New option `gnutls-verify-error', if non-nil, means that Emacs
+should reject SSL/TLS certificates that GnuTLS determines as invalid.
+(This option defaults to nil at present, but this is expected to change
+in a future release.)
+
+** Hi-Lock
+
+*** New global command `M-s h .' (`highlight-symbol-at-point') highlights
+the symbol near point.
+
+*** New option `hi-lock-auto-select-face'.  When non-nil, hi-lock commands
+will cycle through faces in `hi-lock-face-defaults' without prompting.
+
 ** Icomplete
 Icomplete is now more similar to Ido.
 
----
 *** Icomplete by default now applies to all forms of minibuffer completion.
 The variable `icomplete-with-completion-tables' (now a user option)
 controls this.  To restore the old behavior, set it back to
 '(internal-complete-buffer).
 
-+++
 *** You can navigate through and select completions using the keys
 from `icomplete-minibuffer-map'.
 
----
 *** The string that separates potential completions is now a customizable
 option (`icomplete-separator').  The default is " | " rather than ",".
 
----
 *** New face `icomplete-first-match'; and new options
 `icomplete-hide-common-prefix' and `icomplete-show-matches-on-no-input'.
 
----
 *** The option `icomplete-show-key-bindings' has been removed.
 
 ** Ido
 
-+++
 *** An Ido user manual is now included.
 
----
 *** The option `ido-use-virtual-buffers' can now take the value `auto'.
 This means to use virtual buffers if the current ido input does not match
 an existing buffer.
 
----
 *** The variable `ido-decorations' can optionally have two new elements,
 which are the brackets to use around the sole remaining completion.
 
 ** Image mode
 
-+++
 *** New commands `n' (`image-next-file') and `p' (`image-previous-file')
 visit the next image file and the previous image file in the same
 directory, respectively.
 
-+++
 *** New commands to show specific frames of multi-frame images.
 `f' (`image-next-frame') and `b' (`image-previous-frame') visit the
 next or previous frame.  `F' (`image-goto-frame') shows a specific frame.
 
-+++
 *** New commands to speed up, slow down, or reverse animation.
 `a +' (`image-increase-speed') and `a -' (`image-decrease-speed') to
 speed up and slow down the animation.  `a r' (`image-reverse-speed')
 to reverse it and `a 0' (`image-reset-speed') to reset it.
 
----
 *** The command `image-mode-fit-frame' deletes other windows.
 When toggling, it restores the frame's previous window configuration.
 It also has an optional frame argument, which can be used by Lisp
 callers to fit the image to a frame other than the selected frame.
 
-** Hi-Lock
-
-+++
-*** New global command `M-s h .' (`highlight-symbol-at-point') highlights
-the symbol found near point.
-
-+++
-*** New option `hi-lock-auto-select-face'.  When non-nil, hi-lock commands
-will cycle through faces in `hi-lock-face-defaults' without prompting.
-
----
 ** New Imenu option `imenu-generic-skip-comments-and-strings'.
 
 ** Info
 
----
 *** New Info face `info-index-match', used to highlight matches in index
 entries displayed by `Info-index-next', `Info-virtual-index' and
 `info-apropos'.
 
----
 *** The Info-edit command is obsolete.  Editing Info nodes by hand
 has not been relevant for some time.
 
 ** JS Mode
 
----
 *** New option `js-switch-indent-offset'.
 
----
 *** Better indentation of multiple-variable declarations.
 If a declaration spans several lines, variables on the following lines
 are lined up to the first one.
 
----
 *** Recognition and better indentation of continuations in array comprehensions.
 
-+++
 ** MH-E has been updated to version 8.5 - see separate MH-E-NEWS file.
 
-+++
 ** Octave mode
 
 *** Font locking for Texinfo comments and new keywords.
@@ -949,67 +790,53 @@ are lined up to the first one.
 
 *** Documentation lookup/search.
 
-+++
 ** OPascal mode is the new name for Delphi mode
 
----
 *** All delphi-* variables and functions have been renamed to opascal-*.
 Obsolete aliases exist for those likely to have been used externally.
 
----
 *** The option `delphi-newline-always-indents' has been removed.
 Use `electric-indent-mode' instead.
 
----
 *** The TAB key runs the standard `indent-for-tab-command', not `delphi-tab'.
 
 ** Package
 
-+++
 *** The package library now supports digital signing of packages.
 Maintainers of package archives should consider signing their packages
 to enhance security.
 
-+++
 **** If the user option `package-check-signature' is non-nil,
 Emacs tries to check package signatures at install time.
 The value `allow-unsigned' allows installation of unsigned packages.
 
-+++
 **** The user option `package-unsigned-archives' lists archives where
 Emacs will not try to check signatures.
 
-+++
 *** New option `package-pinned-packages'.  This is useful if you have multiple
-archives enabled, with more than one offering a package that you want.
+archives enabled, with more than one offering a given package that you want.
 
-+++
 *** In the `list-packages' buffer, you can use `f' (`package-menu-filter')
 to filter the list of packages by a keyword.
 
-+++
 *** In the `describe-package' buffer, there are now buttons listing the
 keywords related to the package.  Click on a button to see other packages
 related to that keyword.
 
----
 *** The format of `archive-contents' files, generated by package
 repositories, has changed to allow a new (fifth) element in the data
 vectors, containing an associative list with extra properties.
 (For example, `describe-package' uses the `:url' extra property to
 display a "Homepage" header.)
 
----
 ** In Prolog mode, `prolog-use-smie' has been removed,
 along with the non-SMIE indentation code.
 
 ** Remember
 
-+++
 *** The new command `remember-notes' creates a buffer that is saved on exit.
 You can use it as a more permanent *scratch* buffer.
 
-+++
 *** Remember can now store notes in separate files.
 To use this, add `remember-store-in-files' to the `remember-handler-functions'
 option.  The files are saved in `remember-data-directory' using
@@ -1017,109 +844,84 @@ names specified by `remember-directory-file-name-format'.
 
 ** Rmail
 
-+++
 *** Customize `rmail-mbox-format' to influence some minor aspects of
 how Rmail displays non-MIME messages.
 
----
 *** The `unrmail' command now converts from BABYL to mboxrd format,
 rather than mboxo.  Customize `unrmail-mbox-format' to change this.
 
 ** Ruby mode
 
----
 *** Improved syntax highlighting and indentation.
 
----
 *** New `electric-indent-mode' integration.
 
----
 *** New option `ruby-encoding-magic-comment-style'.
 
----
 *** New option `ruby-custom-encoding-magic-comment-template'.
 
----
 *** New option `ruby-align-to-stmt-keywords'.
 
----
 *** New option `ruby-align-chained-calls'.
 
----
 *** More Ruby file types have been added to `auto-mode-alist'.
 
 ** Search and Replace
 
-+++
 *** New global command `M-s .' (`isearch-forward-symbol-at-point')
 starts a symbol (identifier) incremental search forward with the
 symbol found near point added to the search string initially.
 
-+++
 *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name
 and adds it to the search string.
 
-+++
 *** `M-s i' in Isearch mode toggles whether search matches invisible text.
 
-+++
 *** `query-replace' skips invisible text when `search-invisible' is nil,
 and opens overlays with hidden text when `search-invisible' is `open'.
 
-+++
-*** A negative prefix arg of replacement commands replaces backward.
+*** A negative prefix argument of replacement commands replaces backward.
 `M-- M-%' replaces a string backward, `M-- C-M-%' replaces a regexp
 backward, `M-s w words M-- M-%' replaces a sequence of words backward.
 
-+++
 *** By default, prefix arguments do not now terminate Isearch mode.
-Set `isearch-allow-prefix' to nil to restore old behavior.
+Set `isearch-allow-prefix' to nil to restore the old behavior.
 
-+++
 *** More Isearch commands accept prefix arguments, namely
 `isearch-printing-char', `isearch-quote-char', `isearch-yank-word',
 `isearch-yank-line'.
 
-+++
 *** Word search now matches whitespace at the beginning/end
 of the search string if it contains leading/trailing whitespace.
 In an incremental word search or when using a non-nil LAX argument
 of `word-search-regexp', the lax matching can also match part of
 the first word (in addition to the lax matching of the last word).
-The same rules are now applied to the symbol search with the difference
+The same rules are now applied to the symbol search, with the difference
 that it matches symbols, and non-symbol characters between symbols.
 
-+++
 ** New SES command `ses-rename-cell' allows assignment of names to SES cells.
 
----
 ** The shell.el option `explicit-bash-args' includes --noediting by default.
 All non-ancient Bash versions support this option.
 
 ** Shell Script mode
 
----
 *** The SMIE indentation engine is now used by default - see `sh-use-smie'.
 
----
 *** `sh-mode' now has its own setting for `add-log-current-defun-function'.
 
 ** SMIE
 
-+++
 *** You can customize the SMIE indentation of a mode via `smie-config'.
 The command `smie-config-guess' can help you derive the appropriate
 indentation settings, if you provide it with an indented sample file.
 Use `smie-config-save' to save the result.
 
-+++
 *** You can customize the SMIE indentation of a file by adding an entry to
 the file's local variables of the form: `eval: (smie-config-local '(RULES))'.
 
-+++
 *** New commands `smie-config-show-indent' and `smie-config-set-indent'.
 
----
 ** SQL mode
 
 *** Improved login monitoring and appropriate response to login failures.
@@ -1131,10 +933,8 @@ in `sql-placeholders-filter'.  When starting SQL*Plus, `sql-oracle-options'
 are passed before the logon parameter, as required.  The default now
 includes `-L', to limit the number of logon attempts per invocation.
 
----
 ** New Term mode option `term-suppress-hard-newline'.
 
-+++
 ** Todo mode has been rewritten and enhanced.
 The Todo mode user manual describes all commands and most user
 options.  To support some of these features, a new file format is
@@ -1166,12 +966,10 @@ or in archive files, undoing or unarchiving done items.
 
 ** Trace
 
----
 *** `trace-function' and `trace-function-background' no longer prompt for
 the output buffer.  Unless you use a prefix argument, they output to
 `trace-buffer'.
 
----
 *** With a prefix argument, `trace-function' and `trace-function-background'
 will prompt for a "context".  This is a Lisp expression, whose value at the
 time the function is entered/exited is printed along with the function's
@@ -1179,109 +977,102 @@ name and arguments.
 
 ** Tramp
 
-+++
-*** The experimental url syntax for remote file names has been removed.
-
-+++
 *** New connection method "adb", which allows to access Android
 devices by the Android Debug Bridge.  The variable `tramp-adb-program'
 can be used to adapt the path of the "adb" program, if needed.
 
-+++
+*** Handlers for `file-acl' and `set-file-acl' for remote machines
+that support POSIX ACLs.
+
+*** Handlers for `file-notify-add-watch' and `file-notify-rm-watch'
+for remote machines that support filesystem notifications.
+
+*** The experimental url syntax for remote file names has been removed.
+
 *** The connection methods "plink1", "ssh1", "ssh2", "scp1", "scp2",
 "scpc" and "rsyncc" are discontinued.  The ssh option
 "ControlMaster=auto" is set automatically in all ssh-based methods,
 when possible.  See `tramp-use-ssh-controlmaster-options'.
 
-+++
-*** Handlers for `file-acl' and `set-file-acl' for remote machines
-which support POSIX ACLs.
-
-+++
-*** Handlers for `file-notify-add-watch' and `file-notify-rm-watch'
-for remote machines which support filesystem notifications.
-
-+++
 ** New URL command `url-cookie-list' displays the current cookies,
 and allows you to interactively remove cookies.
 
 ** VC and related modes
 
-+++
 *** In VC directory mode, `D' displays diffs between VC-controlled
 whole tree revisions.
 
-+++
 *** In VC directory mode, `L' lists the change log for the current VC
 controlled tree in a window.
 
-+++
 *** In VC directory mode, `I' shows a log of changes that will be
 received with a pull operation.
 
-+++
 *** `C-x v G' (globally) and `G' (in VC directory mode) ignores a file
 under current version control system.  When called with a prefix
 argument, you can remove a file from the ignored file list.
 
 ** VHDL mode
 
----
 *** New options: `vhdl-actual-generic-name', `vhdl-beautify-options'.
 
----
 *** New commands: `vhdl-fix-statement-region', `vhdl-fix-statement-buffer'.
 
----
 ** The Woman commands `woman-default-faces' and `woman-monochrome-faces'
 are obsolete.  Customize the `woman-*' faces instead.
 
+** More packages look for ~/.emacs.d/<foo> additionally to ~/.<foo>.
+Affected files:
+~/.emacs.d/timelog      replaces  ~/.timelog
+~/.emacs.d/vip          replaces  ~/.vip
+~/.emacs.d/viper        replaces  ~/.viper
+~/.emacs.d/ido.last     replaces  ~/.ido.last
+~/.emacs.d/kkcrc        replaces  ~/.kkcrc
+~/.emacs.d/quickurls    replaces  ~/.quickurls
+~/.emacs.d/idlwave/     replaces  ~/.idlwave/
+~/.emacs.d/bdfcache.el  replaces  ~/.bdfcache.el
+~/.emacs.d/places       replaces  ~/.emacs-places
+~/.emacs.d/shadows      replaces  ~/.shadows
+~/.emacs.d/shadow_todo  replaces  ~/.shadow_todo
+~/.emacs.d/strokes      replaces  ~/.strokes
+~/.emacs.d/notes        replaces  ~/.notes
+~/.emacs.d/type-break   replaces  ~/.type-break
+Also the following files used by the now obsolete otodo-mode.el:
+~/.emacs.d/todo-do      replaces  ~/.todo-do
+~/.emacs.d/todo-done    replaces  ~/.todo-done
+~/.emacs.d/todo-top     replaces  ~/.todo-top
+
 ** Obsolete packages
 
-+++
 *** iswitchb.el; use icomplete-mode.
 
----
 *** longlines.el; use visual-line-mode.
 
----
 *** meese.el.
 
-+++
 *** sup-mouse.el.
 
----
 *** terminal.el; use term.el instead.
 
----
 *** the old version of todo-mode.el (renamed to otodo-mode.el).
 
----
 *** xesam.el (owing to the cancellation of the XESAM project).
 
-+++
 *** yow.el; use fortune.el or cookie1.el instead.
 
 
 * New Modes and Packages in Emacs 24.4
 
-+++
 ** New package `eww' is a built-in web browser.
-It is only available if Emacs is compiled with libxml2 support.
+(It is only available if Emacs is compiled with libxml2 support.)
 
-+++
-** New minor mode `superword-mode'.
-This overrides the default word motion commands to treat "symbol_words"
-as a single word, similar to what `subword-mode' does.
-
-+++
 ** New package nadvice.el offers lighter-weight advice facilities.
 It is layered as:
 
-*** add-function/remove-function, which can be used to add/remove code on any
-function-carrying place, such as process-filters or `<foo>-function' hooks.
+*** `add-function'/`remove-function', which can be used to add/remove code on
+any function-carrying place, such as process filters or `<foo>-function' hooks.
 
-*** advice-add/advice-remove to add/remove a piece of advice on a named
+*** `advice-add'/`advice-remove' to add/remove a piece of advice on a named
 function, much like `defadvice' does.
 
 ** New package frameset.el.
@@ -1290,39 +1081,21 @@ or a subset of the existing frames and windows, somewhat similar to a
 frame configuration), both in-session and persistently, and restore it
 at some point in the future.
 
-+++
 ** New package filenotify.el provides an interface for file system
 notifications.  It requires that Emacs be compiled with one of the
 low-level libraries gfilenotify.c, inotify.c or w32notify.c.
 
-
-* Incompatible Lisp Changes in Emacs 24.4
-
-+++
-** Do not assume that the priority of all overlays will be numeric.
-(You should still only specify integer priorities on overlays you create.)
-If you need to sort arbitrary overlays into priority order, `overlays-at'
-can now optionally do this.
-
----
-** `kill-region' has lost its `yank-handler' optional argument.
-
-+++
-** `(input-pending-p)' no longer runs other timers that are ready to run.
-The new optional CHECK-TIMERS parameter allows for the prior behavior.
-
-+++
-** `defvar' and `defcustom' in a let-binding affect the "external" default.
+** New minor modes `prettify-symbols-mode' and `global-prettify-symbols-mode'
+display specified symbols as composed characters.  E.g., in Emacs Lisp mode,
+this replaces the string "lambda" with the Greek lambda character.
 
----
-** The syntax of ?» and ?« is now punctuation instead of matched parens.
-Some languages match those as »...«, and others as «...», so it is
-better for Emacs to stay neutral by default.
+** New minor mode `superword-mode'.
+This overrides the default word motion commands to treat "symbol_words"
+as a single word, similar to what `subword-mode' does.
 
----
-** In compiled Lisp files, the header no longer includes a timestamp.
+
+* Incompatible Lisp Changes in Emacs 24.4
 
-+++
 ** The default file coding for Emacs Lisp files is now utf-8.
 (See `file-coding-system-alist'.)  In most cases, this change is
 transparent, but files that contain unusual characters without
@@ -1330,384 +1103,263 @@ specifying an explicit coding system may fail to load with obscure
 errors.  You should either convert them to utf-8 or add an explicit
 `coding:' cookie.
 
-+++
+** Default process filters and sentinels are not nil any more.
+Instead they default to a function that does what the nil value used to do.
+
+** Overlay priority does not have to be nil or a non-negative integer.
+Overlay priority can be other kinds of Lisp objects.  We didn't yet
+decide whether other types of values are stable enough, and therefore
+don't feel it's right to document them.  For now, don't assume in your
+code that the values of overlay priority can only be either nil or an
+integer, always test them with an appropriate predicate to be one or
+the other.  If you need to sort arbitrary overlays into priority
+order, `overlays-at' can now optionally do this.
+You should still only specify integer priorities on overlays you create.
+
+** The cars of the elements in `interpreter-mode-alist' are now
+treated as regexps rather than literal strings.
+
 ** `overriding-terminal-local-map' no longer replaces the local keymaps.
 It used to disable the minor mode, major mode, and text-property keymaps,
 whereas now it simply has higher precedence.
 
-+++
-** Default process filters and sentinels are not nil any more.
-Instead they default to a function that does what the nil value used to do.
+** `kill-region' has lost its `yank-handler' optional argument.
+
+** `(input-pending-p)' no longer runs other timers that are ready to run.
+The new optional CHECK-TIMERS parameter allows for the prior behavior.
+
+** `defvar' and `defcustom' in a let-binding affect the "external" default.
+
+** The syntax of ?» and ?« is now punctuation instead of matched parens.
+Some languages match those as »...«, and others as «...», so it is
+better for Emacs to stay neutral by default.
 
-+++
 ** `read-event' does not return decoded chars in ttys any more.
 As was the case in Emacs 22 and before, the decoding of terminal
 input, according to `keyboard-coding-system', is not performed in
 `read-event' any more.  But unlike in Emacs 22, this decoding is still
-done before input-decode-map, function-key-map, etc.
-
----
-** The option `inhibit-local-menu-bar-menus' has been removed.
+done before `input-decode-map', `function-key-map', etc.
 
----
-** Frame-local variables that affect redisplay do not work any more.
-More specifically, redisplay does not bother to check for a frame-local
-value when looking up variables.
-
-+++
-** nil and "unbound" are indistinguishable in `symbol-function'.
+** In `symbol-function', nil and "unbound" are indistinguishable.
 `symbol-function' does not signal a `void-function' error any more.
 To determine if a symbol's function definition is void, use `fboundp'.
 
-+++
 ** `defadvice' does not honor the `freeze' flag and cannot advise
 special-forms any more.
 
----
 ** `dolist' no longer binds VAR while evaluating the RESULT form,
 when lexical binding is enabled.  Previously, VAR was bound to nil,
 which often led to spurious unused-variable warnings.
 
-+++
 ** The return value of `backup-buffer' has changed.
 The second argument is no longer an SELinux context, instead it is an
 alist of extended attributes as returned by the new function
 `file-extended-attributes'.  The attributes can be applied to another
 file using `set-file-extended-attributes'.
 
-+++
 ** By default `copy-file' no longer copies file permission bits to an
 existing destination; and it sets the file permission bits of a newly
 created destination to those of the source, masked by the default file
 permissions.  To copy the file permission bits, pass t as the
 PRESERVE-PERMISSIONS argument of `copy-file'.
 
-+++
 ** `visited-file-modtime' now returns -1 for nonexistent files.
 Formerly it returned a list (-1 LOW USEC PSEC), but this was ambiguous
 in the presence of files with negative time stamps.
 
-+++
-** The cars of the elements in `interpreter-mode-alist' are now
-treated as regexps rather than literal strings.
+** Frame-local variables that affect redisplay do not work any more.
+More specifically, redisplay does not bother to check for a frame-local
+value when looking up variables.
 
----
-** Overlay priority does not have to be nil or a non-negative integer.
-Overlay priority can be other kinds of Lisp objects.  We didn't yet
-decide whether other types of values are stable enough, and therefore
-don't feel it's right to document them.  For now, don't assume in your
-code that the values of overlay priority can only be either nil or an
-integer, always test them with an appropriate predicate to be one or
-the other.
+** In compiled Lisp files, the header no longer includes a timestamp.
+
+** The option `inhibit-local-menu-bar-menus' has been removed.
 
 
 * Lisp Changes in Emacs 24.4
 
-+++
-** The second argument of `eval' can now specify a lexical environment.
+** Change to the Emacs Lisp coding conventions: the package descriptor
+and name of global variables, constants, and functions should be separated
+by two hyphens if the symbol is not meant to be used by other packages.
 
-+++
-** New functions `special-form-p' and `macrop'.
+** The second argument of `eval' can now specify a lexical environment.
 
-+++
 ** New macro `define-alternatives' can be used to define generic commands.
 Generic commands are interactive functions whose implementation can be
 selected among several alternatives, as a matter of user preference.
 
-+++
+** Numeric comparison functions =, <, >, <=, >= can now take many arguments.
+
+** New functions `special-form-p' and `macrop'.
+
+** New macro `with-eval-after-load'.
+This is like the old `eval-after-load', but better behaved.
+
 ** If you give a symbol a `defalias-fset-function' property, `defalias'
 on that symbol will use the associated value as a function to call
 in place of `fset'.
 
-+++
 ** New variable `enable-dir-local-variables'.
 Directory-local variables are ignored if this is nil.  This may be
 useful for modes that want to ignore directory-locals while still
 respecting file-local variables.
 
-+++
-** New function `get-pos-property'.
-
-+++
 ** `read-regexp' now uses the new variable `read-regexp-defaults-function'
 as a function to call to provide default values.
 
-** Completion changes
+** New functions `group-gid' and `group-real-gid'.
+
+** New function `get-pos-property'.
+
+** New hook `pre-redisplay-function'.
+
+** `byte-compile-interactive-only-functions' is now obsolete.
+To specify that a command should only be called interactively, give it
+a non-nil `interactive-only' property.
+
+** New function `string-suffix-p'.
+
+** `split-string' now takes an optional argument TRIM.
+The value, if non-nil, is a regexp that specifies what to trim from
+the start and end of each substring.
+
+** Completion
 
----
 *** The separator used by `completing-read-multiple' is now a regexp.
 The default `crm-separator' has been changed to allow surrounding spaces
 around the comma.
 
-+++
-*** The `common-substring' argument of `display-completion-list',
-which has been documented as obsolete since Emacs 23.1, is now _really_
-obsolete, and no longer advertised.  Instead either call
-`completion-hilit-commonality' to add the highlighting; or use
-`completion-all-completions', which returns highlighted strings.
-
-+++
 *** New function `completion-table-with-cache' is a wrapper for
 `completion-table-dynamic' that caches the result of the last lookup.
 
-+++
 *** New function `completion-table-merge' to combine several
 completion tables by merging their completions.
 
-+++
-** New minor modes `prettify-symbols-mode' and `global-prettify-symbols-mode'
-display specified symbols as composed characters.  E.g., in Emacs Lisp mode,
-this replaces the string "lambda" with the Greek lambda character.
-
-** Terminal changes
-
-+++
-*** Functions to pop up menus and dialogs now work on all terminals,
-including TTYs.  This includes `x-popup-menu', `x-popup-dialog',
-`message-box', `yes-or-no-p', etc.
-
-The function `display-popup-menus-p' will now return non-nil for a
-display or frame whenever a mouse is supported on that display or
-frame.
-
-+++
-*** New hook `tty-setup-hook', run at the end of initializing a text terminal.
+*** The `common-substring' argument of `display-completion-list',
+which has been documented as obsolete since Emacs 23.1, is now _really_
+obsolete, and no longer advertised.  Instead either call
+`completion-hilit-commonality' to add the highlighting; or use
+`completion-all-completions', which returns highlighted strings.
 
-+++
-*** The hook `term-setup-hook' is obsolete.  It is entirely equivalent
-to `emacs-startup-hook'.  See also the new `tty-setup-hook'.
+** Encoding and decoding of text
 
-+++
-** New hook `pre-redisplay-function'.
+*** New coding-system `prefer-utf-8'.
+This is like `undecided' but prefers UTF-8 on decoding if the text to
+be decoded does not contain any invalid UTF-8 sequences.  On encoding,
+any non-ASCII characters are automatically encoded as UTF-8.
 
-+++
-** New bool-vector set operation functions
-*** `bool-vector-exclusive-or'
-*** `bool-vector-union'
-*** `bool-vector-intersection'
-*** `bool-vector-set-difference'
-*** `bool-vector-not'
-*** `bool-vector-subsetp'
-*** `bool-vector-count-consecutive'
-*** `bool-vector-count-population'
+*** New attributes of coding-systems whose type is `undecided'.
+Two new attributes, `:inhibit-null-byte-detection' and
+`:inhibit-iso-escape-detection', determine how to detect encoding of
+text that includes null bytes and ISO-2022 escape sequences, respectively.
+Each of these attributes can be either nil, zero, or t.  If t, decoding
+text ignores null bytes and ISO-2022 sequences, respectively.  If nil,
+null bytes cause text to be decoded with no-conversion, and ISO-2022
+sequences cause Emacs to assume the text is encoded in one of the ISO-2022
+encodings, such as iso-2022-7bit.  If zero, Emacs consults the variables
+`inhibit-null-byte-detection' and `inhibit-iso-escape-detection'.
+The new attribute `:prefer-utf-8', if non-nil, causes Emacs to prefer
+UTF-8 encoding and decoding, whenever possible.
 
-+++
-** Comparison functions =, <, >, <=, >= can now take many arguments.
+These attributes are only meaningful for coding-systems of type `undecided'.
+(The type of a coding-system is determined by its `:coding-type' attribute
+and can be accessed by calling the `coding-system-type' function.)
 
-** Error-handling changes
+** Error-handling
 
-+++
 *** New function `define-error'.
 
-+++
 *** `with-demoted-errors' takes an additional argument `format'.
 
-+++
-** New macro `with-eval-after-load'.
-This is like the old `eval-after-load', but better behaved.
+** Faces
 
----
-** New library subr-x.el with miscellaneous small utility functions
-*** `hash-table-keys'
-*** `hash-table-values'
-*** `string-blank-p'
-*** `string-empty-p'
-*** `string-join'
-*** `string-reverse'
-*** `string-trim-left'
-*** `string-trim-right'
-*** `string-trim'
-*** `string-remove-prefix'
-*** `string-remove-suffix'
-
-+++
-** Obsoleted functions
-*** `log10'
-*** `dont-compile'
-*** `lisp-complete-symbol'
-*** `field-complete'
-*** `minibuffer-completion-contents'
-*** `isearch-nonincremental-exit-minibuffer'
-*** `isearch-filter-visible'
-*** `generic-make-keywords-list'
-*** `get-upcase-table' (use `case-table-get-table' instead).
+*** Face specs set via Custom themes now replace the `defface' spec
+rather than inheriting from it.  In other words, setting a face via a
+theme now behaves like setting it via Customize: you only need to
+specify the attributes that you want, you don't need to unset those
+that you don't want.
 
-+++
-** `with-wrapper-hook' is obsoleted by `add-function'.
-The few hooks that used with-wrapper-hook are replaced as follows:
-*** `abbrev-expand-function' obsoletes `abbrev-expand-functions'.
-*** `completion-in-region-function' obsoletes `completion-in-region-functions'.
-*** `filter-buffer-substring-function' obsoletes `filter-buffer-substring-functions'.
+*** The function `face-spec-set' is now like `setq' for face specs.
+Its third arg now accepts values specifying a face spec type (defface,
+custom, or override spec), and the relevant spec is set accordingly.
 
-+++
-** `byte-compile-interactive-only-functions' is now obsolete.
-To specify that a command should only be called interactively, give it
-a non-nil `interactive-only' property.
+*** New face spec attribute :distant-foreground
+specifies foreground to use if background color is near the foreground
+color that would otherwise have been used.
 
-+++
-** `split-string' now takes an optional argument TRIM.
-The value, if non-nil, is a regexp that specifies what to trim from
-the start and end of each substring.
+*** New function `add-face-text-property', which can be used to
+conveniently prepend/append new face properties.
 
-+++
-** New function `string-suffix-p'.
+*** New face characteristic (supports :underline (:style wave))
+specifies whether or not the terminal can display a wavy line.
 
-** File-handling changes
+** File-handling
 
-+++
 *** Support for filesystem notifications.
 Emacs now supports notifications of filesystem changes, such as
 creation, modification, and deletion of files.  This requires the
 `glib' API, or the 'inotify' API (on GNU/Linux systems only).  On
-MS-Windows systems, this is supported for Windows XP and newer
-versions.
+MS-Windows systems, this is supported for Windows XP and newer.
 
-+++
 *** The 9th element returned by `file-attributes' is now unspecified.
 Formerly, it was t if the file's gid would change if file were deleted
 and recreated.  This value has been inaccurate for years on many
 platforms, and nobody seems to have noticed or cared.
 
-+++
 *** The 6th argument to `copy-file' has been renamed to
 PRESERVE-PERMISSIONS as it now handles ACL entries and the traditional
 Unix file permission bits as well as SELinux context.
 
-+++
 *** The function `file-ownership-preserved-p' now has an optional
 argument GROUP which causes it check for file group too.  This can be
 used in place of the 9th element of `file-attributes'.
 
----
-*** The function `set-visited-file-modtime' now accepts a 0 or -1
-argument, with the same interpretation as the returned value of
-`visited-file-modtime'.
-
-** Revert and Autorevert changes
-
-+++
-*** The default values of `buffer-stale-function', `revert-buffer-function',
-and `revert-buffer-insert-file-contents-function' are no longer nil.
-Instead they default to functions that do what the nil value used to.
-
-+++
-*** `buffer-stale-function' is now used for buffers visiting files too.
-
----
-*** If Emacs is compiled with file notification support, it uses notifications
-instead of checking file time stamps.  To disable this, set the user option
-`auto-revert-use-notify' to nil.  Alternatively, you can specify a regular
-expression matching directories to be excluded from file notifications via
-`auto-revert-notify-exclude-dir-regexp'.
-
----
-*** The new user option `auto-revert-remote-files' enables reversion
-of remote files, if set to non-nil.
-
-** Face changes
-
-+++
-*** The function `face-spec-set' is now like `setq' for face specs.
-Its third arg now accepts values specifying a face spec type (defface,
-custom, or override spec), and the relevant spec is set accordingly.
-
-+++
-*** New function `add-face-text-property', which can be used to
-conveniently prepend/append new face properties.
-
----
-*** Face specs set via Custom themes now replace the `defface' spec
-rather than inheriting from it.  In other words, setting a face via a
-theme now behaves like setting it via Customize: you only need to
-specify the attributes that you want, you don't need to unset those
-that you don't want.
-
----
-*** New face characteristic (supports :underline (:style wave))
-specifies whether or not the terminal can display a wavy line.
-
-+++
-*** New face spec attribute :distant-foreground
-specifies foreground to use if background color is near the foreground
-color that would otherwise have been used.
+*** The function `set-visited-file-modtime' now accepts a 0 or -1 argument,
+with the same interpretation as the returned value of `visited-file-modtime'.
 
 ** Image API
 
-+++
 *** `image-animated-p' is now `image-multi-frame-p'.
 It returns non-nil for any image that contains multiple frames,
 whether or not it specifies a frame delay.
 
-+++
 *** New variable `image-default-frame-delay' gives the frame delay for
 animated images which do not specify a frame delay.
 
-+++
 *** New functions `image-current-frame' and `image-show-frame' for getting
 and setting the current frame of a multi-frame image.
 
-** EIEIO
+** Revert and Autorevert
 
-+++
-*** Namespace cleanup by obsolete-aliasing functions to use `eieio-' prefix.
-**** object-name -> eieio-object-name
-**** object-class -> eieio-object-class
-**** object-class-fast -> eieio--object-class
-**** object-class-name -> eieio-object-class-name
-**** object-name-string -> eieio-object-name-string
-**** object-num-slots -> eieio--object-num-slots
-**** object-set-name-string -> eieio-object-set-name-string
-**** class-of -> eieio-object-class
-**** class-name -> eieio-class-name
-**** class-parent -> eieio-class-parent
-**** class-parents -> eieio-class-parents
-**** class-parents-fast -> eieio-class-parents-fast
-**** class-children -> eieio-class-children
-**** class-num-slots -> eieio--class-num-slots
-**** class-precedence-list -> eieio-class-precedence-list
-**** class-direct-subclasses -> eieio-class-children
-**** class-direct-superclasses -> eieio-class-parents
-
-** Changes in encoding and decoding of text
+*** If Emacs is compiled with file notification support, it uses notifications
+instead of checking file time stamps.  To disable this, set the user option
+`auto-revert-use-notify' to nil.  Alternatively, you can specify a regular
+expression matching directories to be excluded from file notifications via
+`auto-revert-notify-exclude-dir-regexp'.
 
----
-*** New coding-system `prefer-utf-8'.
-This is like `undecided' but prefers UTF-8 on decoding if the text to
-be decoded does not contain any invalid UTF-8 sequences.  On encoding,
-any non-ASCII characters are automatically encoded as UTF-8.
+*** The default values of `buffer-stale-function', `revert-buffer-function',
+and `revert-buffer-insert-file-contents-function' are no longer nil.
+Instead they default to functions that do what the nil value used to.
 
----
-*** New attributes of coding-systems whose type is `undecided'.
-Two new attributes, `:inhibit-null-byte-detection' and
-`:inhibit-iso-escape-detection', determine how to detect encoding of
-text that includes null bytes and ISO-2022 escape sequences,
-respectively.  Each of these attributes can be either nil, zero, or
-t.  If it is t, decoding text ignores null bytes and, respectively,
-ISO-2022 sequences.  If it is nil, null bytes cause text to be decoded
-with no-conversion and ISO-2022 sequences cause Emacs to assume the
-text is encoded in one of the ISO-2022 encodings, such as
-iso-2022-7bit.  If the value is zero, Emacs consults the variables
-inhibit-null-byte-detection and inhibit-iso-escape-detection, which
-see.
-The new attribute `:prefer-utf-8', if non-nil, causes Emacs to prefer
-UTF-8 encoding and decoding, whenever possible.
+*** `buffer-stale-function' is now used for buffers visiting files too.
 
-These attributes are only meaningful for coding-systems of type
-`undecided'.  (The type of a coding-system is determined by its
-`:coding-type' attribute and can be accessed by calling the
-`coding-system-type' function.)
+*** The new user option `auto-revert-remote-files' enables reversion
+of remote files, if non-nil.
 
----
-** The `time-to-seconds' alias to `float-time' is no longer marked obsolete.
+** Terminal
 
-+++
-** New functions `group-gid' and `group-real-gid'.
+*** Functions to pop up menus and dialogs now work on all terminals,
+including TTYs.  This includes `x-popup-menu', `x-popup-dialog',
+`message-box', `yes-or-no-p', etc.
 
----
-** The spelling of the rx.el category `chinese-two-byte' has been
-corrected (the first 'e' was missing).
+The function `display-popup-menus-p' will now return non-nil for a
+display or frame whenever a mouse is supported on that display or frame.
+
+*** New hook `tty-setup-hook', run at the end of initializing a text terminal.
+
+*** The hook `term-setup-hook' is obsolete.  It is entirely equivalent
+to `emacs-startup-hook'.  See also the new `tty-setup-hook'.
 
----
 ** Minor internal changes to the details of lock files.
 The lock for DIR/FILE is now _always_ DIR/.#FILE.
 If DIR/.#FILE already exists and is not an Emacs lock file,
@@ -1716,23 +1368,92 @@ numbered lock files DIR/.#FILE.0...).
 On file systems that do not support symbolic links, the lock is now a
 regular file with contents being what would have been in the symlink.
 
-** Changes to the Emacs Lisp Coding Conventions in Emacs 24.4
+** New bool-vector set operation functions:
+*** `bool-vector-exclusive-or'
+*** `bool-vector-union'
+*** `bool-vector-intersection'
+*** `bool-vector-set-difference'
+*** `bool-vector-not'
+*** `bool-vector-subsetp'
+*** `bool-vector-count-consecutive'
+*** `bool-vector-count-population'
 
-+++
-*** The package descriptor and name of global variables, constants,
-and functions should be separated by two hyphens if the symbol is not
-meant to be used by other packages.
+** New library subr-x.el with miscellaneous small utility functions:
+*** `hash-table-keys'
+*** `hash-table-values'
+*** `string-blank-p'
+*** `string-empty-p'
+*** `string-join'
+*** `string-reverse'
+*** `string-trim-left'
+*** `string-trim-right'
+*** `string-trim'
+*** `string-remove-prefix'
+*** `string-remove-suffix'
+
+** The `time-to-seconds' alias to `float-time' is no longer marked obsolete.
+
+** The spelling of the rx.el category `chinese-two-byte' has been
+corrected (the first 'e' was missing).
+
+** EIEIO namespace cleanup, obsolete-aliasing functions to use `eieio-' prefix:
+*** object-name -> eieio-object-name
+*** object-class -> eieio-object-class
+*** object-class-fast -> eieio--object-class
+*** object-class-name -> eieio-object-class-name
+*** object-name-string -> eieio-object-name-string
+*** object-num-slots -> eieio--object-num-slots
+*** object-set-name-string -> eieio-object-set-name-string
+*** class-of -> eieio-object-class
+*** class-name -> eieio-class-name
+*** class-parent -> eieio-class-parent
+*** class-parents -> eieio-class-parents
+*** class-parents-fast -> eieio-class-parents-fast
+*** class-children -> eieio-class-children
+*** class-num-slots -> eieio--class-num-slots
+*** class-precedence-list -> eieio-class-precedence-list
+*** class-direct-subclasses -> eieio-class-children
+*** class-direct-superclasses -> eieio-class-parents
+
+** Obsoleted functions
+*** `log10'
+*** `dont-compile'
+*** `lisp-complete-symbol'
+*** `field-complete'
+*** `minibuffer-completion-contents'
+*** `isearch-nonincremental-exit-minibuffer'
+*** `isearch-filter-visible'
+*** `generic-make-keywords-list'
+*** `get-upcase-table' (use `case-table-get-table' instead).
+
+** `with-wrapper-hook' is obsoleted by `add-function'.
+The few hooks that used with-wrapper-hook are replaced as follows:
+*** `abbrev-expand-function' obsoletes `abbrev-expand-functions'.
+*** `completion-in-region-function' obsoletes `completion-in-region-functions'.
+*** `filter-buffer-substring-function' obsoletes `filter-buffer-substring-functions'.
 
 
 * Changes in Emacs 24.4 on Non-Free Operating Systems
 
----
+** New Core Text based font backend for Mac OS X 10.5 and newer.
+To use the old font backend, use the following on the command line:
+  % defaults write org.gnu.Emacs FontBackend ns
+GNUstep and Mac OS X 10.4 use the old font backend.
+
+** Improved fullscreen support on Mac OS X 10.7 and newer, where the
+default fullscreen method is now "native" fullscreen.  To use the
+old style fullscreen, customize `ns-use-native-fullscreen' to nil.
+
+** On Mac OS X 10.7 and newer, Emacs can use sRGB colorspace, and does so
+by default.  Customize `ns-use-srgb-colorspace' to go back to the old method.
+Note that this does not apply to images.
+
 ** The procedure for building Emacs on MS-Windows has changed.
 It is now built by running the same configure script as on all other
 platforms.  This requires the MSYS environment and MinGW development
 tools.  See the updated instructions in nt/INSTALL for details.
 
-Using the Posix configure script and Makefile's also means a change in
+Using the Posix configure script and Makefiles also means a change in
 the directory structure of the Emacs installation on Windows.  It is
 now the same as on GNU and Unix systems.  In particular, the auxiliary
 programs, such as cmdproxy.exe and hexl.exe, are in
@@ -1744,7 +1465,6 @@ files are in share/emacs/VERSION/etc.  (Emacs knows about all these
 directories and will find the files in there automatically; there's no
 need to set any variables due to this change.)
 
-+++
 ** Emacs on Windows 2000 and later can now access files and directories
 whose names cannot be encoded in the current system codepage.
 
@@ -1752,40 +1472,21 @@ The new variable `w32-unicode-filenames' controls this feature: if it
 is t, Emacs uses Unicode APIs to pass file names to system calls,
 which lifts the limitation of file names to the current locale.
 
-+++
+** Lock files now work on MS-Windows.
+This helps to prevent losing your edits if the same file is being
+edited in another Emacs session or by another user.  See the node
+"Interlocking" in the Emacs User Manual for the details.  To disable
+file locking, customize `create-lockfiles' to nil.
+
 ** The "generate a backtrace on fatal error" feature now works on MS Windows.
 The backtrace is written to the 'emacs_backtrace.txt' file in the
 directory where Emacs was running.
 
-+++
 ** The variable `buffer-file-type' is no longer supported.
 Setting it has no effect, and %t in the mode-line format is ignored.
 Likewise, `file-name-buffer-file-type-alist' is now obsolete, and
 modifying it has no effect.
 
----
-** Lock files now work on MS-Windows.
-This helps to prevent losing your edits if the same file is being
-edited in another Emacs session or by another user.  See the node
-"Interlocking" in the Emacs User Manual for the details.  To disable
-file locking, customize `create-lockfiles' to nil.
-
-+++
-** New Core Text based font backend for Mac OS X 10.5 and newer.
-To use the old font backend, use the following on the command line:
-  % defaults write org.gnu.Emacs FontBackend ns
-GNUstep and Mac OS X 10.4 use the old font backend.
-
----
-** Improved fullscreen support on Mac OS X 10.7 and newer, where the
-default fullscreen method is now "native" fullscreen.  To use the
-old style fullscreen, customize `ns-use-native-fullscreen' to nil.
-
----
-** On Mac OS X 10.7 and newer, Emacs can use sRGB colorspace, and does so
-by default.  Customize `ns-use-srgb-colorspace' to go back to the old method.
-Note that this does not apply to images.
-
 
 * Installation Changes in Emacs 24.3
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 6733cf176ca..0e2af2d766e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): Fix an off-by-one error when
+        matching overlay strings with 'cursor' property against buffer
+        positions traversed in the glyph row.  (Bug#17744)
+
 2014-06-11  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.h (EmacsApp): Always compile in shouldKeepRunning, isFirst
diff --git a/src/xdisp.c b/src/xdisp.c
index c592e0c3116..54a8c8beb8f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14413,7 +14413,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                                               pos_after, 0);
 
                 if (prop_pos >= pos_before)
-                  bpos_max = prop_pos - 1;
+                  bpos_max = prop_pos;
               }
             if (INTEGERP (chprop))
               {
@@ -14487,7 +14487,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                                               pos_after, 0);
 
                 if (prop_pos >= pos_before)
-                  bpos_max = prop_pos - 1;
+                  bpos_max = prop_pos;
               }
             if (INTEGERP (chprop))
               {
@@ -14517,7 +14517,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
      GLYPH_BEFORE and GLYPH_AFTER.  */
   if (!((row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end)
         && BUFFERP (glyph->object) && glyph->charpos == pt_old)
-      && !(bpos_max < pt_old && pt_old <= bpos_covered))
+      && !(bpos_max <= pt_old && pt_old <= bpos_covered))
     {
       /* An empty line has a single glyph whose OBJECT is zero and
          whose CHARPOS is the position of a newline on that line.