diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-05-14 17:18:18 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-05-14 17:18:18 -0700 |
| commit | 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7 (patch) | |
| tree | 315715009d9fe5af40be38cb0dfccecfaf4c5528 /lisp/nxml/nxml-mode.el | |
| parent | 0f63e17663f99742425c9ec4f282f5e7e3194b1b (diff) | |
| parent | 02bee7860f7e650ef13e00fe1a7f9a362e3eb001 (diff) | |
| download | emacs-5fe9375a5164960c3ecb65a7ef6d742069b8a7d7.tar.gz | |
Merge from origin/emacs-26
02bee78 Let dir locals for more specific modes override those from less
b1235f9 Improve documentation of Hexl mode
32d1813 Fix description of (move-to-column <n> t) when column <n> is ...
0397b7c ; Fix smtpmail-stream-type docstring
7dab3ee Recognize single quote attribute values in nxml and sgml (Bug...
e4cde42 Disable extra display of in nxml-mode (Bug#32897)
ca14dd1 Fix nxml-get-inside (Bug#32003)
e7ab351 Fix positioning client buffer as instructed by emacsclient
# Conflicts:
# lisp/files.el
# lisp/textmodes/sgml-mode.el
Diffstat (limited to 'lisp/nxml/nxml-mode.el')
| -rw-r--r-- | lisp/nxml/nxml-mode.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el index 6f80912dd58..8da9f5ca287 100644 --- a/lisp/nxml/nxml-mode.el +++ b/lisp/nxml/nxml-mode.el @@ -2379,7 +2379,9 @@ With a prefix argument, inserts the character directly." (put 'nxml-char-ref 'evaporate t) (defun nxml-char-ref-display-extra (start end n) - (when nxml-char-ref-extra-display + (when (and ;; Displaying literal newline is unhelpful. + (not (eql n ?\n)) + nxml-char-ref-extra-display) (let ((name (or (get-char-code-property n 'name) (get-char-code-property n 'old-name))) (glyph-string (and nxml-char-ref-display-glyph-flag |