[Emacs-diffs] master 97046e8 5/9: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit 97046e811c738a21e0c4badbb5bab146b6adf6c8
Merge: 314f397 4b347fe
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    4b347fe Clarify that doc fixes are okay in feature freeze
    01669ad Avoid crashes when setting the cursor
    f2144ee Restore 'command-debug-status' functionality
    ec6e4b9 ; Minor addition to CONTRIBUTE
---
 CONTRIBUTE                 |    8 +++++++-
 doc/lispref/debugging.texi |    2 ++
 lisp/subr.el               |    3 +++
 src/callint.c              |    6 +++++-
 src/xdisp.c                |    3 +--
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 9d5d775..8aba424 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -189,7 +189,13 @@ If you are fixing a bug that exists in the current 
release, be sure to
 commit it to the release branch; it will be merged to the master
 branch later by the gitmerge function.
 
-However, if you know that the change will be difficult to merge to the
+Documentation fixes (in doc strings, in manuals, and in comments)
+should always go to the release branch, if the documentation to be
+fixed exists and is relevant to the release-branch codebase.  Doc
+fixes are always considered "safe" -- even when a release branch is in
+feature freeze, it can still receive doc fixes.
+
+When you know that the change will be difficult to merge to the
 master (e.g., because the code on master has changed a lot), you can
 apply the change to both master and branch yourself.  It could also
 happen that a change is cherry-picked from master to the release
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 710ab92..5ff9582 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -685,6 +685,8 @@ invocation.
 The advantage of using this variable rather than an ordinary global
 variable is that the data will never carry over to a subsequent command
 invocation.
+
+This variable is obsolete and will be removed in future versions.
 @end defvar
 
 @defun backtrace-frame frame-number
diff --git a/lisp/subr.el b/lisp/subr.el
index b143812..8a1792a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1388,6 +1388,9 @@ is converted into a string by expressing it in decimal."
 (make-obsolete 'process-filter-multibyte-p nil "23.1")
 (make-obsolete 'set-process-filter-multibyte nil "23.1")
 
+(make-obsolete-variable 'command-debug-status
+                        "expect it to be removed in a future version." "25.2")
+
 ;; Lisp manual only updated in 22.1.
 (define-obsolete-variable-alias 'executing-macro 'executing-kbd-macro
   "before 19.34")
diff --git a/src/callint.c b/src/callint.c
index 053ee6c..c0afc7b 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -837,7 +837,10 @@ invoke it.  If KEYS is omitted or nil, the return value of
   kset_last_command (current_kboard, save_last_command);
 
   {
-    Lisp_Object val = Ffuncall (nargs, args);
+    Lisp_Object val;
+    specbind (Qcommand_debug_status, Qnil);
+
+    val = Ffuncall (nargs, args);
     val = unbind_to (speccount, val);
     SAFE_FREE ();
     return val;
@@ -894,6 +897,7 @@ syms_of_callint (void)
   DEFSYM (Qhandle_shift_selection, "handle-shift-selection");
   DEFSYM (Qread_number, "read-number");
   DEFSYM (Qfuncall_interactively, "funcall-interactively");
+  DEFSYM (Qcommand_debug_status, "command-debug-status");
   DEFSYM (Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
   DEFSYM (Qmouse_leave_buffer_hook, "mouse-leave-buffer-hook");
 
diff --git a/src/xdisp.c b/src/xdisp.c
index e806166..3eb11cc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28505,8 +28505,7 @@ display_and_set_cursor (struct window *w, bool on,
     }
 
   glyph = NULL;
-  if (!glyph_row->exact_window_width_line_p
-      || (0 <= hpos && hpos < glyph_row->used[TEXT_AREA]))
+  if (0 <= hpos && hpos < glyph_row->used[TEXT_AREA])
     glyph = glyph_row->glyphs[TEXT_AREA] + hpos;
 
   eassert (input_blocked_p ());