[Emacs-diffs] Changes to emacs/lisp/progmodes/cpp.el

[Juanma Barranquero]

Index: emacs/lisp/progmodes/cpp.el
diff -c emacs/lisp/progmodes/cpp.el:1.24 emacs/lisp/progmodes/cpp.el:1.25
*** emacs/lisp/progmodes/cpp.el:1.24    Mon May 20 14:48:58 2002
--- emacs/lisp/progmodes/cpp.el Tue Feb  4 08:24:34 2003
***************
*** 32,38 ****
  ;;; Todo:
  
  ;; Should parse "#if" and "#elif" expressions and merge the faces
! ;; 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
--- 32,38 ----
  ;;; Todo:
  
  ;; Should parse "#if" and "#elif" expressions and merge the faces
! ;; 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,73 ****
    :type 'face
    :group 'cpp)
  
! (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
--- 67,73 ----
    :type 'face
    :group 'cpp)
  
! (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
***************
*** 368,374 ****
      (cond ((eq cpp-unknown-face 'invisible)
           (cpp-make-overlay-hidden overlay))
          ((eq cpp-unknown-face 'default))
!         (t 
           (overlay-put overlay 'face cpp-unknown-face)))
      (if cpp-unknown-writable
        ()
--- 368,374 ----
      (cond ((eq cpp-unknown-face 'invisible)
           (cpp-make-overlay-hidden overlay))
          ((eq cpp-unknown-face 'default))
!         (t
           (overlay-put overlay 'face cpp-unknown-face)))
      (if cpp-unknown-writable
        ()
***************
*** 461,467 ****
  
  (defun cpp-edit-mode ()
    "Major mode for editing the criteria for highlighting cpp conditionals.
! 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)
--- 461,467 ----
  
  (defun cpp-edit-mode ()
    "Major mode for editing the criteria for highlighting cpp conditionals.
! 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,541 ****
                 (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)))
--- 535,541 ----
                 (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,655 ****
    (interactive
     (let ((symbol (cpp-choose-symbol)))
       (list symbol
!          (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))
--- 649,655 ----
    (interactive
     (let ((symbol (cpp-choose-symbol)))
       (list symbol
!          (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))