[Emacs-diffs] Changes to emacs/lisp/generic.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/generic.el
diff -c emacs/lisp/generic.el:1.20.14.4 emacs/lisp/generic.el:1.20.14.5
*** emacs/lisp/generic.el:1.20.14.4     Wed Sep 15 08:59:55 2004
--- emacs/lisp/generic.el       Wed Dec  8 05:02:15 2004
***************
*** 197,202 ****
--- 197,203 ----
  or a one-character string, it is added to the mode's syntax table with
  `comment-start' syntax.  If the entry is a cons pair, the elements of the
  pair are considered to be `comment-start' and `comment-end' respectively.
+ \(The latter should be nil if you want comments to end at end of line.)
  Note that Emacs has limitations regarding comment characters.
  
  KEYWORD-LIST is a list of keywords to highlight with `font-lock-keyword-face'.
***************
*** 289,301 ****
  
      ;; Go through all the comments
      (dolist (start comment-list)
!       (let ((end ?\n) (comstyle ""))
        ;; Normalize
        (when (consp start)
          (setq end (or (cdr start) end))
          (setq start (car start)))
        (when (characterp start) (setq start (char-to-string start)))
!       (when (characterp end)   (setq end (char-to-string end)))
  
        ;; Setup the vars for `comment-region'
        (if comment-start
--- 290,304 ----
  
      ;; Go through all the comments
      (dolist (start comment-list)
!       (let ((end nil) (comstyle ""))
        ;; Normalize
        (when (consp start)
          (setq end (or (cdr start) end))
          (setq start (car start)))
        (when (characterp start) (setq start (char-to-string start)))
!       (cond
!        ((characterp end)   (setq end (char-to-string end)))
!        ((zerop (length end)) (setq end "\n")))
  
        ;; Setup the vars for `comment-region'
        (if comment-start
***************
*** 414,418 ****
  
  (provide 'generic)
  
! ;;; arch-tag: 239c1fc4-1303-48d9-9ac0-657d655669ea
  ;;; generic.el ends here
--- 417,421 ----
  
  (provide 'generic)
  
! ;; arch-tag: 239c1fc4-1303-48d9-9ac0-657d655669ea
  ;;; generic.el ends here