diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-25 11:16:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-25 11:16:05 -0700 |
| commit | 1bb8ac0c02d91c64ae14e37680fc90ff899da2b4 (patch) | |
| tree | f8a36a8338b59b5ffeaca8b3049c10e385ddf611 /lisp/textmodes | |
| parent | 00a86a558ed3cde443b41c0e24934f61dea99236 (diff) | |
| parent | 48d39c39e822a792f7c20254c3d9f94aa298be31 (diff) | |
| download | emacs-1bb8ac0c02d91c64ae14e37680fc90ff899da2b4.tar.gz emacs-1bb8ac0c02d91c64ae14e37680fc90ff899da2b4.tar.bz2 emacs-1bb8ac0c02d91c64ae14e37680fc90ff899da2b4.zip | |
Merge from origin/emacs-26
48d39c39e8 Search for Syntax section when viewing MDN
9d101376b4 Allow smerge-keep-current to work for empty hunks
13aba24add Call vc-setup-buffer in vc-git-log-{in,out}going
1d599df5e0 Fix last change to textmodes/page-ext.el
a726e09a9a * test/src/lcms-tests.el (lcms-cri-cam02-ucs): Skip if lcm...
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/page-ext.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index dde9e6a8d91..ce9bbf47e77 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -1578,7 +1578,7 @@ to look up will be substituted there." (goto-char (point-min)) (let ((window (get-buffer-window (current-buffer) 'visible))) (when window - (when (re-search-forward "^Summary" nil 'move) + (when (re-search-forward "^\\(Summary\\|Syntax\\)" nil 'move) (beginning-of-line) (set-window-start window (point)))))) diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index d744bd2cf01..94b68decfb7 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -583,6 +583,7 @@ directory for only the accessible portion of the buffer." (with-output-to-temp-buffer pages-directory-buffer (with-current-buffer standard-output (pages-directory-mode) + (setq buffer-read-only nil) (insert "==== Pages Directory: use `C-c C-c' to go to page under cursor. ====" ?\n) (setq pages-buffer pages-target-buffer) @@ -631,6 +632,7 @@ directory for only the accessible portion of the buffer." ))))) (set-buffer standard-output) + (setq buffer-read-only t) ;; Put positions in increasing order to go with buffer. (setq pages-pos-list (nreverse pages-pos-list)) (if (called-interactively-p 'interactive) |