diff options
Diffstat (limited to 'lisp/progmodes/cpp.el')
| -rw-r--r-- | lisp/progmodes/cpp.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index d332d8bff31..3cf17f48b5f 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -1,6 +1,6 @@ ;;; cpp.el --- highlight or hide text according to cpp conditionals -;; Copyright (C) 1994-1995, 2001-2013 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2001-2015 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: c, faces, tools @@ -57,7 +57,7 @@ :group 'cpp) (define-widget 'cpp-face 'lazy - "Either a face or the special symbol 'invisible'." + "Either a face or the special symbol `invisible'." :type '(choice (const invisible) (face))) (defcustom cpp-known-face 'invisible @@ -234,7 +234,8 @@ A prefix arg suppresses display of that buffer." (cpp-progress-message "Parsing...") (while (re-search-forward cpp-parse-regexp nil t) (cpp-progress-message "Parsing...%d%%" - (/ (* 100 (- (point) (point-min))) (buffer-size))) + (floor (* 100.0 (- (point) (point-min))) + (buffer-size))) (let ((match (buffer-substring (match-beginning 0) (match-end 0)))) (cond ((or (string-equal match "'") (string-equal match "\"")) @@ -493,9 +494,10 @@ You can also use the keyboard accelerators indicated like this: [K]ey." (set-buffer buffer) (setq cpp-edit-symbols symbols) (erase-buffer) - (insert "CPP Display Information for `") + (insert (substitute-command-keys "CPP Display Information for `")) (cpp-make-button (buffer-name cpp-edit-buffer) 'cpp-edit-home) - (insert "'\n\nClick mouse-2 on item you want to change or use\n" + (insert (substitute-command-keys + "'\n\nClick mouse-2 on item you want to change or use\n") "or switch to this buffer and type the keyboard equivalents.\n" "Keyboard equivalents are indicated with brackets like [T]his.\n\n") (cpp-make-button "[H]ome (display the C file)" 'cpp-edit-home) |