Mercurial > emacs
changeset 62917:e66c3159d2a4
(vhdl-fill-region): Test ARG, not INTERACTIVE.
(vhdl-emacs-21): Doc fix.
(vhdl-mode): Unconditionally set comment-padding.
(vhdl-fixup-whitespace-region): Insert spaces only where there are none.
(vhdl-statistics-buffer): Make the Emacs 21 behavior universal.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 31 May 2005 04:23:10 +0000 |
| parents | f093607aa05a |
| children | 2e5a0317995c |
| files | lisp/progmodes/vhdl-mode.el |
| diffstat | 1 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/vhdl-mode.el Tue May 31 04:19:10 2005 +0000 +++ b/lisp/progmodes/vhdl-mode.el Tue May 31 04:23:10 2005 +0000 @@ -127,7 +127,7 @@ "Non-nil if XEmacs is used.") ;; Emacs 21 handling (defconst vhdl-emacs-21 (and (= emacs-major-version 21) (not vhdl-xemacs)) - "Non-nil if GNU Emacs 21 is used.") + "Non-nil if Emacs 21 is used.") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -4568,8 +4568,7 @@ (set (make-local-variable 'indent-line-function) 'vhdl-indent-line) (set (make-local-variable 'comment-start) "--") (set (make-local-variable 'comment-end) "") - (when vhdl-emacs-21 - (set (make-local-variable 'comment-padding) "")) + (set (make-local-variable 'comment-padding) "") (set (make-local-variable 'comment-column) vhdl-inline-comment-column) (set (make-local-variable 'end-comment-column) vhdl-end-comment-column) (set (make-local-variable 'comment-start-skip) "--+\\s-*") @@ -7484,7 +7483,13 @@ (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\)\\|\\(\\([^/:<>=]\\)\\(:\\|=\\|<\\|>\\|:=\\|<=\\|>=\\|=>\\|/=\\)\\([^=>]\\|$\\)\\)" end t) (if (match-string 1) (goto-char (match-end 1)) - (replace-match "\\3 \\4 \\5") + (save-excursion + (goto-char (match-beginning 4)) + (unless (eq (preceding-char) ?\ ) + (insert " ")) + (goto-char (match-end 4)) + (unless (eq (following-char) ?\ ) + (insert " "))) (goto-char (match-end 4)))) ;; eliminate multiple spaces and spaces at end of line (goto-char beg) @@ -7540,7 +7545,7 @@ (interactive "r\np") (save-excursion (goto-char beg) - (let ((margin (if interactive (current-indentation) (current-column)))) + (let ((margin (if arg (current-indentation) (current-column)))) (goto-char end) (setq end (point-marker)) ;; remove inline comments, newlines and whitespace @@ -12055,8 +12060,7 @@ # statements : %5d\n\ # code lines : %5d\n\ # total lines : %5d\n\ " - (buffer-file-name) no-stats no-code-lines no-lines) - (unless vhdl-emacs-21 (vhdl-show-messages)))) + (buffer-file-name) no-stats no-code-lines no-lines))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Help functions