diff options
| author | John Wiegley | 2015-12-29 21:40:28 -0800 |
|---|---|---|
| committer | John Wiegley | 2015-12-29 21:40:28 -0800 |
| commit | 9f2f14a0725211b13a744573344636b57b9c98b9 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/progmodes/cpp.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-9f2f14a0725211b13a744573344636b57b9c98b9.tar.gz emacs-9f2f14a0725211b13a744573344636b57b9c98b9.zip | |
Merge emacs-25 into master (using imerge)
Diffstat (limited to 'lisp/progmodes/cpp.el')
| -rw-r--r-- | lisp/progmodes/cpp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 3cf17f48b5f..faa917a87a7 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el | |||
| @@ -664,7 +664,7 @@ otherwise make them unwritable." | |||
| 664 | 664 | ||
| 665 | (defun cpp-edit-write (symbol branch) | 665 | (defun cpp-edit-write (symbol branch) |
| 666 | "Set which branches of SYMBOL should be writable to BRANCH. | 666 | "Set which branches of SYMBOL should be writable to BRANCH. |
| 667 | BRANCH should be either nil (false branch), t (true branch) or 'both." | 667 | BRANCH should be either nil (false branch), t (true branch) or `both'." |
| 668 | (interactive (list (cpp-choose-symbol) (cpp-choose-branch))) | 668 | (interactive (list (cpp-choose-symbol) (cpp-choose-branch))) |
| 669 | (setcar (nthcdr 3 (cpp-edit-list-entry-get-or-create symbol)) branch) | 669 | (setcar (nthcdr 3 (cpp-edit-list-entry-get-or-create symbol)) branch) |
| 670 | (cpp-edit-reset)) | 670 | (cpp-edit-reset)) |