mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(vhdl-fill-region): Test ARG, not INTERACTIVE.

Browse source 
(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.
This commit is contained in:
Richard M. Stallman 2005-05-31 04:23:29 +00:00
parent 1376845c3c
commit f35aff821d
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2005-05-31 Richard M. Stallman <rms@gnu.org>
* progmodes/vhdl-mode.el (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.
2005-05-30 John Wiegley <johnw@newartisans.com>
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el,

18
lisp/progmodes/vhdl-mode.el
View file

@ -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 @@ Key bindings:
(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 @@ end of line, do nothing in comments and strings."
(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 @@ buffer."
(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 @@ File statistics: \"%s\"\n\
# 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