[Emacs-diffs] Changes to emacs/lisp/progmodes/vhdl-mode.el

[Richard M . Stallman]

Index: emacs/lisp/progmodes/vhdl-mode.el
diff -c emacs/lisp/progmodes/vhdl-mode.el:1.30 
emacs/lisp/progmodes/vhdl-mode.el:1.31
*** emacs/lisp/progmodes/vhdl-mode.el:1.30      Thu May 26 16:39:28 2005
--- emacs/lisp/progmodes/vhdl-mode.el   Tue May 31 04:23:10 2005
***************
*** 127,133 ****
    "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.")
  
  
  
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 127,133 ----
    "Non-nil if XEmacs is used.")
  ;; Emacs 21 handling
  (defconst vhdl-emacs-21 (and (= emacs-major-version 21) (not vhdl-xemacs))
!   "Non-nil if Emacs 21 is used.")
  
  
  
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
***************
*** 4568,4575 ****
    (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-column) vhdl-inline-comment-column)
    (set (make-local-variable 'end-comment-column) vhdl-end-comment-column)
    (set (make-local-variable 'comment-start-skip) "--+\\s-*")
--- 4568,4574 ----
    (set (make-local-variable 'indent-line-function) 'vhdl-indent-line)
    (set (make-local-variable 'comment-start) "--")
    (set (make-local-variable 'comment-end) "")
!   (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,7490 ****
      (while (re-search-forward 
"\\(--.*\n\\|\"[^\"\n]*[\"\n]\\)\\|\\(\\([^/:<>=]\\)\\(:\\|=\\|<\\|>\\|:=\\|<=\\|>=\\|=>\\|/=\\)\\([^=>]\\|$\\)\\)"
 end t)
        (if (match-string 1)
          (goto-char (match-end 1))
!       (replace-match "\\3 \\4 \\5")
        (goto-char (match-end 4))))
      ;; eliminate multiple spaces and spaces at end of line
      (goto-char beg)
--- 7483,7495 ----
      (while (re-search-forward 
"\\(--.*\n\\|\"[^\"\n]*[\"\n]\\)\\|\\(\\([^/:<>=]\\)\\(:\\|=\\|<\\|>\\|:=\\|<=\\|>=\\|=>\\|/=\\)\\([^=>]\\|$\\)\\)"
 end t)
        (if (match-string 1)
          (goto-char (match-end 1))
!       (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,7546 ****
    (interactive "r\np")
    (save-excursion
      (goto-char beg)
!     (let ((margin (if interactive (current-indentation) (current-column))))
        (goto-char end)
        (setq end (point-marker))
        ;; remove inline comments, newlines and whitespace
--- 7545,7551 ----
    (interactive "r\np")
    (save-excursion
      (goto-char beg)
!     (let ((margin (if arg (current-indentation) (current-column))))
        (goto-char end)
        (setq end (point-marker))
        ;; remove inline comments, newlines and whitespace
***************
*** 12055,12062 ****
  # 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))))
  
  
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Help functions
--- 12060,12066 ----
  # statements  : %5d\n\
  # code lines  : %5d\n\
  # total lines : %5d\n\ "
!            (buffer-file-name) no-stats no-code-lines no-lines)))
  
  
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Help functions