aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/cpp.el
diff options
context:
space:
mode:
authorK. Handa2015-09-01 20:46:15 +0900
committerK. Handa2015-09-01 20:46:15 +0900
commit3e0e2339cd379eeba8d9bc758f2e8e574144e252 (patch)
tree9d119efed6e52e5c24dbd84836148157271799a8 /lisp/progmodes/cpp.el
parent524eeb2e5e158d98ea52fe5ebe4768c4433ba8b2 (diff)
parentff0a92f6461941902eb9e974bdd2ff9adacb7bc4 (diff)
downloademacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.tar.gz
emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/progmodes/cpp.el')
-rw-r--r--lisp/progmodes/cpp.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index 685bb21b430..3cf17f48b5f 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -494,9 +494,10 @@ You can also use the keyboard accelerators indicated like this: [K]ey."
494 (set-buffer buffer) 494 (set-buffer buffer)
495 (setq cpp-edit-symbols symbols) 495 (setq cpp-edit-symbols symbols)
496 (erase-buffer) 496 (erase-buffer)
497 (insert "CPP Display Information for `") 497 (insert (substitute-command-keys "CPP Display Information for `"))
498 (cpp-make-button (buffer-name cpp-edit-buffer) 'cpp-edit-home) 498 (cpp-make-button (buffer-name cpp-edit-buffer) 'cpp-edit-home)
499 (insert "'\n\nClick mouse-2 on item you want to change or use\n" 499 (insert (substitute-command-keys
500 "'\n\nClick mouse-2 on item you want to change or use\n")
500 "or switch to this buffer and type the keyboard equivalents.\n" 501 "or switch to this buffer and type the keyboard equivalents.\n"
501 "Keyboard equivalents are indicated with brackets like [T]his.\n\n") 502 "Keyboard equivalents are indicated with brackets like [T]his.\n\n")
502 (cpp-make-button "[H]ome (display the C file)" 'cpp-edit-home) 503 (cpp-make-button "[H]ome (display the C file)" 'cpp-edit-home)