X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3c0a21c03dd342b2087720d0ab8a000da32fcc22..fbf349734468d48b421c3d03074bb66dfcf3115b:/lisp/progmodes/cpp.el diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 590795a554..c615082814 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -1,6 +1,7 @@ -;;; cpp.el --- Highlight or hide text according to cpp conditionals. +;;; cpp.el --- highlight or hide text according to cpp conditionals -;; Copyright (C) 1994, 1995 Free Software Foundation +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation ;; Author: Per Abrahamsen ;; Keywords: c, faces, tools @@ -19,8 +20,8 @@ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -32,7 +33,7 @@ ;;; Todo: ;; Should parse "#if" and "#elif" expressions and merge the faces -;; somehow. +;; somehow. ;; Somehow it is sometimes possible to make changes near a read only ;; area which you can't undo. Their are other strange effects in that @@ -67,7 +68,7 @@ :type 'face :group 'cpp) -(defcustom cpp-face-type 'light +(defcustom cpp-face-type 'light "*Indicate what background face type you prefer. Can be either light or dark for color screens, mono for monochrome screens, and none if you don't use a window system and don't have @@ -92,7 +93,7 @@ Each entry is a list with the following elements: 0. The name of the macro (a string). 1. Face used for text that is `ifdef' the macro. 2. Face used for text that is `ifndef' the macro. -3. `t', `nil', or `both' depending on what text may be edited." +3. t, nil, or `both' depending on what text may be edited." :type '(repeat (list string face face (choice (const t) (const nil) @@ -144,7 +145,7 @@ or a cons cell (background-color . COLOR)." '("light gray" "light blue" "light cyan" "light yellow" "light pink" "pale green" "beige" "orange" "magenta" "violet" "medium purple" "turquoise") - "Background colours useful with dark foreground colors." + "Background colors useful with dark foreground colors." :type '(repeat string) :group 'cpp) @@ -152,7 +153,7 @@ or a cons cell (background-color . COLOR)." '("dim gray" "blue" "cyan" "yellow" "red" "dark green" "brown" "dark orange" "dark khaki" "dark violet" "purple" "dark turquoise") - "Background colours useful with light foreground colors." + "Background colors useful with light foreground colors." :type '(repeat string) :group 'cpp) @@ -368,7 +369,7 @@ A prefix arg suppresses display of that buffer." (cond ((eq cpp-unknown-face 'invisible) (cpp-make-overlay-hidden overlay)) ((eq cpp-unknown-face 'default)) - (t + (t (overlay-put overlay 'face cpp-unknown-face))) (if cpp-unknown-writable () @@ -379,9 +380,6 @@ A prefix arg suppresses display of that buffer." (defun cpp-make-overlay-hidden (overlay) ;; Make overlay hidden and intangible. (overlay-put overlay 'invisible 'cpp) - (overlay-put overlay 'intangible t) - ;; Unfortunately `intangible' is not implemented for overlays yet, - ;; so we make is read-only instead. (overlay-put overlay 'modification-hooks '(cpp-signal-read-only)) (overlay-put overlay 'insert-in-front-hooks '(cpp-signal-read-only))) @@ -461,7 +459,7 @@ A prefix arg suppresses display of that buffer." (defun cpp-edit-mode () "Major mode for editing the criteria for highlighting cpp conditionals. -Click on objects to change them. +Click on objects to change them. You can also use the keyboard accelerators indicated like this: [K]ey." (kill-all-local-variables) (buffer-disable-undo) @@ -535,7 +533,7 @@ You can also use the keyboard accelerators indicated like this: [K]ey." (eq write 'both)) (setq cpp-edit-list (delq entry cpp-edit-list) entry nil)) - + (if (> (length symbol) 39) (insert (substring symbol 0 39) ": ") (insert (format "%39s: " symbol))) @@ -649,7 +647,7 @@ With optional argument ARG, make them writable iff ARG is positive." (interactive (let ((symbol (cpp-choose-symbol))) (list symbol - (cpp-choose-face "False face" + (cpp-choose-face "False face" (nth 2 (assoc symbol cpp-edit-list)))))) (setcar (nthcdr 2 (cpp-edit-list-entry-get-or-create symbol)) face) (cpp-edit-reset)) @@ -676,7 +674,7 @@ BRANCH should be either nil (false branch), t (true branch) or 'both." ;; Choose a symbol if called from keyboard, otherwise use the one clicked on. (if cpp-button-event cpp-callback-data - (completing-read "Symbol: " (mapcar 'list cpp-edit-symbols) nil t))) + (completing-read "Symbol: " cpp-edit-symbols nil t))) (defun cpp-choose-branch () ;; Choose a branch, either nil, t, or both. @@ -687,7 +685,7 @@ BRANCH should be either nil (false branch), t (true branch) or 'both." cpp-branch-list)))) (defun cpp-choose-face (prompt default) - ;; Choose a face from cpp-face-defalt-list. + ;; Choose a face from cpp-face-default-list. ;; PROMPT is what to say to the user. ;; DEFAULT is the default face. (or (if cpp-button-event @@ -824,4 +822,5 @@ BRANCH should be either nil (false branch), t (true branch) or 'both." (provide 'cpp) +;;; arch-tag: fb7d433d-745d-495a-96f0-86908ab63f74 ;;; cpp.el ends here