emacs: lisp/progmodes/cc-mode.el comparison

comparison lisp/progmodes/cc-mode.el @ 90320:8a1ee48a8386

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-26 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 119-122) - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Sun, 26 Feb 2006 07:09:24 +0000
parents	4b3d39451150 3d8b060d10fb
children	8a8e69664178

comparison

equal deleted inserted replaced

-:c6cf8c705e11
+:8a1ee48a8386
 ;;; cc-mode.el --- major mode for editing C and similar languages
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software
-;; Free Software Foundation, Inc.
+;; Foundation, Inc.
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 (if normal-erase-is-backspace
 (progn
 	(define-key c-mode-base-map (kbd "C-c C-<delete>")
 	  'c-hungry-delete-forward)
 	(define-key c-mode-base-map (kbd "C-c C-<backspace>")
-	  'c-hungry-backspace))
+	  'c-hungry-delete-backwards))
 (define-key c-mode-base-map (kbd "C-c C-<delete>")
-'c-hungry-backspace)
+'c-hungry-delete-backwards)
 (define-key c-mode-base-map (kbd "C-c C-<backspace>")
 'c-hungry-delete-forward)))
 (if c-mode-base-map
 nil
 ;; We bind the forward deletion key and (implicitly) C-d to
 ;; `c-electric-delete-forward', and the backward deletion key to
 ;; `c-electric-backspace'.  The hungry variants are bound to the
 ;; same keys but prefixed with C-c.  This implies that C-c C-d is
 ;; `c-hungry-delete-forward'.  For consistency, we bind not only C-c
-;; <backspace> to `c-hungry-backspace' but also C-c C-<backspace>,
+;; <backspace> to `c-hungry-delete-backwards' but also
-;; so that the Ctrl key can be held down during the whole sequence
+;; C-c C-<backspace>, so that the Ctrl key can be held down during
-;; regardless of the direction.  This in turn implies that we bind
+;; the whole sequence regardless of the direction.  This in turn
-;; C-c C-<delete> to `c-hungry-delete-forward', for the same reason.
+;; implies that we bind C-c C-<delete> to `c-hungry-delete-forward',
+;; for the same reason.
 ;; Bind the electric deletion functions to C-d and DEL.  Emacs 21
 ;; automatically maps the [delete] and [backspace] keys to these two
 ;; depending on window system and user preferences.  (In earlier
 ;; versions it's possible to do the same by using `function-key-map'.)
 (define-key c-mode-base-map "\C-d" 'c-electric-delete-forward)
 (define-key c-mode-base-map "\177" 'c-electric-backspace)
 (define-key c-mode-base-map "\C-c\C-d"     'c-hungry-delete-forward)
-(define-key c-mode-base-map [?\C-c ?\d]    'c-hungry-backspace)
+(define-key c-mode-base-map [?\C-c ?\d]    'c-hungry-delete-backwards)
-(define-key c-mode-base-map [?\C-c ?\C-\d] 'c-hungry-backspace)
+(define-key c-mode-base-map [?\C-c ?\C-\d] 'c-hungry-delete-backwards)
 (define-key c-mode-base-map [?\C-c deletechar] 'c-hungry-delete-forward) ; C-c <delete> on a tty.
 (define-key c-mode-base-map [?\C-c (control deletechar)] ; C-c C-<delete> on a tty.
 'c-hungry-delete-forward)
 (when (boundp 'normal-erase-is-backspace)
 ;; The automatic C-d and DEL mapping functionality doesn't extend
 ;; `c-electric-delete' and `c-hungry-delete' functions.
 (define-key c-mode-base-map [delete]    'c-electric-delete)
 (define-key c-mode-base-map [backspace] 'c-electric-backspace)
 (define-key c-mode-base-map (kbd "C-c <delete>") 'c-hungry-delete)
 (define-key c-mode-base-map (kbd "C-c C-<delete>") 'c-hungry-delete)
-(define-key c-mode-base-map (kbd "C-c <backspace>") 'c-hungry-backspace)
+(define-key c-mode-base-map (kbd "C-c <backspace>")
-(define-key c-mode-base-map (kbd "C-c C-<backspace>") 'c-hungry-backspace))
+'c-hungry-delete-backwards)
+(define-key c-mode-base-map (kbd "C-c C-<backspace>")
+'c-hungry-delete-backwards))
 (define-key c-mode-base-map "#"         'c-electric-pound)
 (define-key c-mode-base-map "{"         'c-electric-brace)
 (define-key c-mode-base-map "}"         'c-electric-brace)
 (define-key c-mode-base-map "/"         'c-electric-slash)
 (c-save-buffer-state ()
 ;; When `combine-after-change-calls' is used we might get calls
 ;; with regions outside the current narrowing.  This has been
 ;; observed in Emacs 20.7.
 (save-restriction
-(widen)
+(save-match-data		  ; c-recognize-<>-arglists changes match-data
+	(widen)
-(when (> end (point-max))
-	;; Some emacsen might return positions past the end. This has been
+	(when (> end (point-max))
-	;; observed in Emacs 20.7 when rereading a buffer changed on disk
+	  ;; Some emacsen might return positions past the end. This has been
-	;; (haven't been able to minimize it, but Emacs 21.3 appears to
+	  ;; observed in Emacs 20.7 when rereading a buffer changed on disk
-	;; work).
+	  ;; (haven't been able to minimize it, but Emacs 21.3 appears to
-	(setq end (point-max))
+	  ;; work).
-	(when (> beg end)
+	  (setq end (point-max))
-	  (setq beg end)))
+	  (when (> beg end)
+	    (setq beg end)))
-(c-invalidate-sws-region-after beg end)
-(c-invalidate-state-cache beg)
+	(c-invalidate-sws-region-after beg end)
-(c-invalidate-find-decl-cache beg)
+	(c-invalidate-state-cache beg)
+	(c-invalidate-find-decl-cache beg)
-(when c-recognize-<>-arglists
-	(c-after-change-check-<>-operators beg end)))))
+	(when c-recognize-<>-arglists
+	  (c-after-change-check-<>-operators beg end))))))
 (defun c-basic-common-init (mode default-style)
 "Do the necessary initialization for the syntax handling routines
 and the line breaking/filling code.  Intended to be used by other
 packages that embed CC Mode.
 ;; setup the comment indent variable in a Emacs version portable way
 (make-local-variable 'comment-indent-function)
 (setq comment-indent-function 'c-comment-indent)
-;; Put submode indicators onto minor-mode-alist, but only once.
+;;   ;; Put submode indicators onto minor-mode-alist, but only once.
-(or (assq 'c-submode-indicators minor-mode-alist)
+;;   (or (assq 'c-submode-indicators minor-mode-alist)
-(setq minor-mode-alist
+;;       (setq minor-mode-alist
-	    (cons '(c-submode-indicators c-submode-indicators)
+;; 	    (cons '(c-submode-indicators c-submode-indicators)
-		  minor-mode-alist)))
+;; 		  minor-mode-alist)))
+(c-update-modeline)
 ;; Install the functions that ensure that various internal caches
 ;; don't become invalid due to buffer changes.
 (make-local-hook 'after-change-functions)
 (add-hook 'after-change-functions 'c-after-change nil t))
 (let ((rfn (assq mode c-require-final-newline)))
 (when rfn
 (make-local-variable 'require-final-newline)
 (and (cdr rfn)
 	   (setq require-final-newline mode-require-final-newline)))))
+(defun c-remove-any-local-eval-or-mode-variables ()
+;; If the buffer specifies `mode' or `eval' in its File Local Variable list
+;; or on the first line, remove all occurrences.  See
+;; `c-postprocess-file-styles' for justification.  There is no need to save
+;; point here, or even bother too much about the buffer contents.
+;;
+;; Most of the code here is derived from Emacs 21.3's `hack-local-variables'
+;; in files.el.
+(goto-char (point-max))
+(search-backward "\n\^L" (max (- (point-max) 3000) (point-min)) 'move)
+(let (lv-point (prefix "") (suffix ""))
+(when (let ((case-fold-search t))
+	    (search-forward "Local Variables:" nil t))
+(setq lv-point (point))
+;; The prefix is what comes before "local variables:" in its line.
+;; The suffix is what comes after "local variables:" in its line.
+(skip-chars-forward " \t")
+(or (eolp)
+	  (setq suffix (buffer-substring (point)
+					 (progn (end-of-line) (point)))))
+(goto-char (match-beginning 0))
+(or (bolp)
+	  (setq prefix
+		(buffer-substring (point)
+				  (progn (beginning-of-line) (point)))))
+(while (search-forward-regexp
+	      (concat "^[ \t]*"
+		      (regexp-quote prefix)
+		      "\\(mode\\|eval\\):.*"
+		      (regexp-quote suffix)
+		      "$")
+	      nil t)
+	(beginning-of-line)
+	(kill-line 1)))
+;; Delete the first line, if we've got one, in case it contains a mode spec.
+(unless (and lv-point
+		 (progn (goto-char lv-point)
+			(forward-line 0)
+			(bobp)))
+(goto-char (point-min))
+(unless (eobp)
+	(kill-line 1)))))
 (defun c-postprocess-file-styles ()
 "Function that post processes relevant file local variables in CC Mode.
 Currently, this function simply applies any style and offset settings
 found in the file's Local Variable list.  It first applies any style
 ;; Problem: The file local variable block might have explicitly set a
 ;; style variable.  The `c-set-style' or `mapcar' call might have
 ;; overwritten this.  So we run `hack-local-variables' again to remedy
 ;; this.  There are no guarantees this will work properly, particularly as
 ;; we have no control over what the other hook functions on
-;; `hack-local-variables-hook' would have done, or what any "eval"
+;; `hack-local-variables-hook' would have done.  We now (2006/2/1) remove
-;; expression will do when evaluated again.  C'est la vie!  ACM,
+;; any `eval' or `mode' expressions before we evaluate again (see below).
-;; 2005/11/2.
+;; ACM, 2005/11/2.
+;;
+;; Problem (bug reported by Gustav Broberg): if one of the variables is
+;; `mode', this will invoke c-mode (etc.) again, setting up the style etc.
+;; We prevent this by temporarily removing `mode' from the Local Variables
+;; section.
 (if (or c-file-style c-file-offsets)
-	(let ((hack-local-variables-hook nil))
+	(c-tentative-buffer-changes
-	  (hack-local-variables)))))
+	  (let ((hack-local-variables-hook nil))
+	    (c-remove-any-local-eval-or-mode-variables)
+	    (hack-local-variables))
+	  nil))))
 (add-hook 'hack-local-variables-hook 'c-postprocess-file-styles)
 (defmacro c-run-mode-hooks (&rest hooks)
 ;; Emacs 21.1 has introduced a system with delayed mode hooks that

Mercurial > emacs

comparison lisp/progmodes/cc-mode.el @ 90320:8a1ee48a8386