diff options
| author | John Wiegley | 2016-01-02 23:31:52 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-01-02 23:31:52 -0800 |
| commit | 91917dd58ec5278e555b9c693a830749083e8f89 (patch) | |
| tree | 3b0c8104106f6dec7873378bccc1273e587f6051 /lisp/progmodes/cpp.el | |
| parent | c988877f436bbbb285a0b34f5e037f7758dd6349 (diff) | |
| parent | 9f2f14a0725211b13a744573344636b57b9c98b9 (diff) | |
| download | emacs-91917dd58ec5278e555b9c693a830749083e8f89.tar.gz emacs-91917dd58ec5278e555b9c693a830749083e8f89.zip | |
Merge branch 'emacs-25-merge'
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)) |