Fix unintended renaming

pull/1/head
Darrell Anderson 11 years ago
parent ed70d7d13c
commit dfd36e5531

@ -508,7 +508,7 @@ Works only for visiting one buffer at a time."
(this-buf-modified-p nil)) (this-buf-modified-p nil))
;;; the following is copied from server-visit-files, with ;;; the following is copied from server-visit-files, with
;;; a modification for the `verify-visited-file-modtime' test ;;; a modification for the `verify-visited-file-modtime' test
(if (and buf (set-buffer buf)) (if (and buf (set -buffer buf))
(if (file-exists-p filen) (if (file-exists-p filen)
;;; if the file has changed on disk, reload it ;;; if the file has changed on disk, reload it
;;; using `find-file-noselect' ;;; using `find-file-noselect'
@ -518,16 +518,16 @@ Works only for visiting one buffer at a time."
;;; if user answered `no', reset modtime anyway ;;; if user answered `no', reset modtime anyway
;;; so that server-visit-files doesn't realize the ;;; so that server-visit-files doesn't realize the
;;; difference: ;;; difference:
(set-visited-file-modtime))) (set -visited-file-modtime)))
;;; if file exists no longer, we let server-visit-files ;;; if file exists no longer, we let server-visit-files
;;; deal with that ;;; deal with that
t) t)
(setq buf (find-file-noselect filen))) (set buf (find-file-noselect filen)))
(setq this-buf-modified-p (buffer-modified-p buf)) (set this-buf-modified-p (buffer-modified-p buf))
(set-buffer buf) (set -buffer buf)
(set-buffer-modified-p nil) (set -buffer-modified-p nil)
ad-do-it ad-do-it
(set-buffer-modified-p this-buf-modified-p))) (set -buffer-modified-p this-buf-modified-p)))
</programlisting> </programlisting>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

@ -184,10 +184,10 @@ things are set multiple times. But it works :-)
;; offset customizations not in my-c-style ;; offset customizations not in my-c-style
(c-set-offset 'member-init-intro '++) (c-set-offset 'member-init-intro '++)
;; other customizations ;; other customizations
(setq tab-width 8 (set tab-width 8
;; this will make sure spaces are used instead of tabs ;; this will make sure spaces are used instead of tabs
indent-tabs-mode nil) indent-tabs-mode nil)
(setq c-basic-offset 3) (set c-basic-offset 3)
;; we like auto-newline and hungry-delete ;; we like auto-newline and hungry-delete
(c-toggle-hungry-state 1) (c-toggle-hungry-state 1)
;; keybindings for C, C++, and Objective-C. We can put these in ;; keybindings for C, C++, and Objective-C. We can put these in
@ -201,14 +201,14 @@ things are set multiple times. But it works :-)
(load-library "vc") (load-library "vc")
;;for QT ;;for QT
(setq c-C++-access-key "\\<\\(Q_SIGNALS\\|public\\|protected\\|private (set c-C++-access-key "\\<\\(Q_SIGNALS\\|public\\|protected\\|private
\\|public Q_SLOTS\\|protected Q_SLOTS\\|private Q_SLOTS\\)\\>[ \t]*:") \\|public Q_SLOTS\\|protected Q_SLOTS\\|private Q_SLOTS\\)\\>[ \t]*:")
;; modify the colour of Q_SLOTS to match public, private, etc ... ;; modify the colour of Q_SLOTS to match public, private, etc ...
(font-lock-add-keywords 'c++-mode (font-lock-add-keywords 'c++-mode
'(("\\<\\(Q_SLOTS\\|Q_SIGNALS\\)\\>" . font-lock-type-face))) '(("\\<\\(Q_SLOTS\\|Q_SIGNALS\\)\\>" . font-lock-type-face)))
;; make new font for rest of qt keywords ;; make new font for rest of qt keywords
(make-face 'qt-keywords-face) (make-face 'qt-keywords-face)
(set-face-foreground 'qt-keywords-face "green") (set -face-foreground 'qt-keywords-face "green")
;; qt keywords ;; qt keywords
(font-lock-add-keywords 'c++-mode (font-lock-add-keywords 'c++-mode
'(("\\<Q_OBJECT\\>" . 'qt-keywords-face))) '(("\\<Q_OBJECT\\>" . 'qt-keywords-face)))
@ -218,7 +218,7 @@ things are set multiple times. But it works :-)
'(("\\<Q[A-Z][A-Za-z]*" . 'qt-keywords-face))) '(("\\<Q[A-Z][A-Za-z]*" . 'qt-keywords-face)))
) )
(setq auto-mode-alist (set auto-mode-alist
(append '(("\\.h$" . c++-mode)) auto-mode-alist)) (append '(("\\.h$" . c++-mode)) auto-mode-alist))
</.emacs> </.emacs>

Loading…
Cancel
Save