HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2010 to copyright years.
[bpt/emacs.git]
/
lisp
/
progmodes
/
cpp.el
diff --git
a/lisp/progmodes/cpp.el
b/lisp/progmodes/cpp.el
index
65ed00e
..
220ecf1
100644
(file)
--- a/
lisp/progmodes/cpp.el
+++ b/
lisp/progmodes/cpp.el
@@
-1,6
+1,6
@@
;;; cpp.el --- highlight or hide text according to cpp conditionals
;;; cpp.el --- highlight or hide text according to cpp conditionals
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
, 2008, 2009, 2010
;; Free Software Foundation
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Free Software Foundation
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
@@
-8,10
+8,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+19,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-103,8
+101,8
@@
Each entry is a list with the following elements:
(cpp-face :tag "True")
(cpp-face :tag "False")
(choice (const :tag "True branch writable" t)
(cpp-face :tag "True")
(cpp-face :tag "False")
(choice (const :tag "True branch writable" t)
- (const :tag "False branch writ
e
able" nil)
- (const :tag "Both branches writ
e
able" both))))
+ (const :tag "False branch writable" nil)
+ (const :tag "Both branches writable" both))))
:group 'cpp)
(defvar cpp-overlay-list nil)
:group 'cpp)
(defvar cpp-overlay-list nil)
@@
-577,8
+575,7
@@
You can also use the keyboard accelerators indicated like this: [K]ey."
"Save the current cpp configuration in a file."
(interactive)
(require 'pp)
"Save the current cpp configuration in a file."
(interactive)
(require 'pp)
- (save-excursion
- (set-buffer cpp-edit-buffer)
+ (with-current-buffer cpp-edit-buffer
(let ((buffer (find-file-noselect cpp-config-file)))
(set-buffer buffer)
(erase-buffer)
(let ((buffer (find-file-noselect cpp-config-file)))
(set-buffer buffer)
(erase-buffer)
@@
-623,7
+620,8
@@
You can also use the keyboard accelerators indicated like this: [K]ey."
(defun cpp-edit-toggle-known (arg)
"Toggle writable status for known conditionals.
(defun cpp-edit-toggle-known (arg)
"Toggle writable status for known conditionals.
-With optional argument ARG, make them writable iff ARG is positive."
+With optional argument ARG, make them writable if ARG is positive,
+otherwise make them unwritable."
(interactive "@P")
(if (or (and (null arg) cpp-known-writable)
(<= (prefix-numeric-value arg) 0))
(interactive "@P")
(if (or (and (null arg) cpp-known-writable)
(<= (prefix-numeric-value arg) 0))
@@
-633,7
+631,8
@@
With optional argument ARG, make them writable iff ARG is positive."
(defun cpp-edit-toggle-unknown (arg)
"Toggle writable status for unknown conditionals.
(defun cpp-edit-toggle-unknown (arg)
"Toggle writable status for unknown conditionals.
-With optional argument ARG, make them writable iff ARG is positive."
+With optional argument ARG, make them writable if ARG is positive,
+otherwise make them unwritable."
(interactive "@P")
(if (or (and (null arg) cpp-unknown-writable)
(<= (prefix-numeric-value arg) 0))
(interactive "@P")
(if (or (and (null arg) cpp-unknown-writable)
(<= (prefix-numeric-value arg) 0))
@@
-831,5
+830,5
@@
BRANCH should be either nil (false branch), t (true branch) or 'both."
(provide 'cpp)
(provide 'cpp)
-;;
;
arch-tag: fb7d433d-745d-495a-96f0-86908ab63f74
+;; arch-tag: fb7d433d-745d-495a-96f0-86908ab63f74
;;; cpp.el ends here
;;; cpp.el ends here