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

[Miles Bader]

Index: emacs/lisp/progmodes/cpp.el
diff -c emacs/lisp/progmodes/cpp.el:1.24.2.1 
emacs/lisp/progmodes/cpp.el:1.24.2.2
*** emacs/lisp/progmodes/cpp.el:1.24.2.1        Fri Apr  4 01:20:32 2003
--- emacs/lisp/progmodes/cpp.el Tue Oct 14 19:30:16 2003
***************
*** 1,6 ****
  ;;; cpp.el --- highlight or hide text according to cpp conditionals
  
! ;; Copyright (C) 1994, 1995 Free Software Foundation
  
  ;; Author: Per Abrahamsen <address@hidden>
  ;; Keywords: c, faces, tools
--- 1,6 ----
  ;;; cpp.el --- highlight or hide text according to cpp conditionals
  
! ;; Copyright (C) 1994, 1995, 2003 Free Software Foundation
  
  ;; Author: Per Abrahamsen <address@hidden>
  ;; Keywords: c, faces, tools
***************
*** 92,98 ****
  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."
    :type '(repeat (list string face face
                       (choice (const t)
                               (const nil)
--- 92,98 ----
  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."
    :type '(repeat (list string face face
                       (choice (const t)
                               (const nil)
***************
*** 379,387 ****
  (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)))
  
--- 379,384 ----
***************
*** 824,827 ****
--- 821,825 ----
  
  (provide 'cpp)
  
+ ;;; arch-tag: fb7d433d-745d-495a-96f0-86908ab63f74
  ;;; cpp.el ends here