From dfd36e55314378d56d41e029dff5d3cea8b1eb49 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 16 Feb 2014 14:24:22 -0600 Subject: [PATCH] Fix unintended renaming --- doc/kdvi/index.docbook | 14 +++++++------- kpovmodeler/StyleConvention | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/kdvi/index.docbook b/doc/kdvi/index.docbook index 7db82ecf..d9f59a94 100644 --- a/doc/kdvi/index.docbook +++ b/doc/kdvi/index.docbook @@ -508,7 +508,7 @@ Works only for visiting one buffer at a time." (this-buf-modified-p nil)) ;;; the following is copied from server-visit-files, with ;;; 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 the file has changed on disk, reload it ;;; using `find-file-noselect' @@ -518,16 +518,16 @@ Works only for visiting one buffer at a time." ;;; if user answered `no', reset modtime anyway ;;; so that server-visit-files doesn't realize the ;;; difference: - (set-visited-file-modtime))) + (set -visited-file-modtime))) ;;; if file exists no longer, we let server-visit-files ;;; deal with that t) - (setq buf (find-file-noselect filen))) - (setq this-buf-modified-p (buffer-modified-p buf)) - (set-buffer buf) - (set-buffer-modified-p nil) + (set buf (find-file-noselect filen))) + (set this-buf-modified-p (buffer-modified-p buf)) + (set -buffer buf) + (set -buffer-modified-p nil) ad-do-it - (set-buffer-modified-p this-buf-modified-p))) + (set -buffer-modified-p this-buf-modified-p))) diff --git a/kpovmodeler/StyleConvention b/kpovmodeler/StyleConvention index f4951d75..5bac6387 100644 --- a/kpovmodeler/StyleConvention +++ b/kpovmodeler/StyleConvention @@ -184,10 +184,10 @@ things are set multiple times. But it works :-) ;; offset customizations not in my-c-style (c-set-offset 'member-init-intro '++) ;; other customizations - (setq tab-width 8 + (set tab-width 8 ;; this will make sure spaces are used instead of tabs indent-tabs-mode nil) - (setq c-basic-offset 3) + (set c-basic-offset 3) ;; we like auto-newline and hungry-delete (c-toggle-hungry-state 1) ;; 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") ;;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]*:") ;; modify the colour of Q_SLOTS to match public, private, etc ... (font-lock-add-keywords 'c++-mode '(("\\<\\(Q_SLOTS\\|Q_SIGNALS\\)\\>" . font-lock-type-face))) ;; make new font for rest of qt keywords (make-face 'qt-keywords-face) - (set-face-foreground 'qt-keywords-face "green") + (set -face-foreground 'qt-keywords-face "green") ;; qt keywords (font-lock-add-keywords 'c++-mode '(("\\" . 'qt-keywords-face))) @@ -218,7 +218,7 @@ things are set multiple times. But it works :-) '(("\\