emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp ChangeLog ediff-diff.el ediff-merg.e...


From: Stefan Monnier
Subject: [Emacs-diffs] emacs/lisp ChangeLog ediff-diff.el ediff-merg.e...
Date: Sat, 31 Jan 2009 22:10:32 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/01/31 22:10:31

Modified files:
        lisp           : ChangeLog ediff-diff.el ediff-merg.el 
                         ediff-mult.el ediff-ptch.el ediff-vers.el 
                         ediff-wind.el ediff.el 
        lisp/emulation : viper-keym.el viper-mous.el viper-util.el 
        lisp/international: robin.el 
        lisp/progmodes : ebrowse.el 

Log message:
        Follow commenting conventions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15234&r2=1.15235
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-diff.el?cvsroot=emacs&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-merg.el?cvsroot=emacs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-mult.el?cvsroot=emacs&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-ptch.el?cvsroot=emacs&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-vers.el?cvsroot=emacs&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-wind.el?cvsroot=emacs&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff.el?cvsroot=emacs&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-keym.el?cvsroot=emacs&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-mous.el?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-util.el?cvsroot=emacs&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/robin.el?cvsroot=emacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/ebrowse.el?cvsroot=emacs&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15234
retrieving revision 1.15235
diff -u -b -r1.15234 -r1.15235
--- ChangeLog   31 Jan 2009 18:53:50 -0000      1.15234
+++ ChangeLog   31 Jan 2009 22:10:22 -0000      1.15235
@@ -1,3 +1,18 @@
+2009-01-31  Stefan Monnier  <address@hidden>
+
+       * progmodes/ebrowse.el:
+       * international/robin.el:
+       * emulation/viper-util.el:
+       * emulation/viper-mous.el:
+       * emulation/viper-keym.el:
+       * ediff.el:
+       * ediff-wind.el:
+       * ediff-vers.el:
+       * ediff-ptch.el:
+       * ediff-mult.el:
+       * ediff-merg.el:
+       * ediff-diff.el: Follow commenting conventions.
+
 2009-01-31  Eli Zaretskii  <address@hidden>
 
        * mail/rmail.el (rmail-redecode-body): Use eight-bit instead of

Index: ediff-diff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-diff.el,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- ediff-diff.el       5 Jan 2009 03:18:57 -0000       1.75
+++ ediff-diff.el       31 Jan 2009 22:10:29 -0000      1.76
@@ -1529,11 +1529,11 @@
 
 
 
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
 
 ;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648
 ;;; ediff-diff.el ends here

Index: ediff-merg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-merg.el,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- ediff-merg.el       5 Jan 2009 03:18:59 -0000       1.42
+++ ediff-merg.el       31 Jan 2009 22:10:29 -0000      1.43
@@ -385,11 +385,11 @@
 (provide 'ediff-merg)
 
 
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
 
 ;; arch-tag: 9b798cf9-02ba-487f-a62e-b63aa823dbfb
 ;;; ediff-merg.el ends here

Index: ediff-mult.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-mult.el,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- ediff-mult.el       9 Jan 2009 04:44:19 -0000       1.65
+++ ediff-mult.el       31 Jan 2009 22:10:29 -0000      1.66
@@ -2396,11 +2396,11 @@
 
 
 
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
 
 ;; arch-tag: c8a76898-f96f-4d9c-be9d-129134017188
 ;;; ediff-mult.el ends here

Index: ediff-ptch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-ptch.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- ediff-ptch.el       5 Jan 2009 03:18:59 -0000       1.46
+++ ediff-ptch.el       31 Jan 2009 22:10:29 -0000      1.47
@@ -834,11 +834,11 @@
 
 
 
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
 
 ;; arch-tag: 2fe2161e-e116-469b-90fa-5cbb44c1bd1b
 ;;; ediff-ptch.el ends here

Index: ediff-vers.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-vers.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- ediff-vers.el       5 Jan 2009 03:19:00 -0000       1.43
+++ ediff-vers.el       31 Jan 2009 22:10:30 -0000      1.44
@@ -232,11 +232,11 @@
 (provide 'ediff-vers)
 
 
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
 
 ;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf
 ;;; ediff-vers.el ends here

Index: ediff-wind.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-wind.el,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- ediff-wind.el       5 Jan 2009 03:19:01 -0000       1.65
+++ ediff-wind.el       31 Jan 2009 22:10:30 -0000      1.66
@@ -1303,11 +1303,11 @@
 (provide 'ediff-wind)
 
 
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
 
 ;; arch-tag: 73d9a5d7-eed7-4d9c-8b4b-21d5d78eb597
 ;;; ediff-wind.el ends here

Index: ediff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- ediff.el    5 Jan 2009 03:19:01 -0000       1.106
+++ ediff.el    31 Jan 2009 22:10:30 -0000      1.107
@@ -273,16 +273,17 @@
 (defalias 'ediff3 'ediff-files3)
 
 
-;; Visit FILE and arrange its buffer to Ediff's liking.
-;; FILE is actually a variable symbol that must contain a true file name.
-;; BUFFER-NAME is a variable symbol, which will get the buffer object into
-;; which FILE is read.
-;; LAST-DIR is the directory variable symbol where FILE's
-;; directory name should be returned.  HOOKS-VAR is a variable symbol that will
-;; be assigned the hook to be executed after `ediff-startup' is finished.
-;; `ediff-find-file' arranges that the temp files it might create will be
-;; deleted.
 (defun ediff-find-file (file-var buffer-name &optional last-dir hooks-var)
+  "Visit FILE and arrange its buffer to Ediff's liking.
+FILE-VAR is actually a variable symbol whose value must contain a true
+file name.
+BUFFER-NAME is a variable symbol, which will get the buffer object into
+which FILE is read.
+LAST-DIR is the directory variable symbol where FILE's
+directory name should be returned.  HOOKS-VAR is a variable symbol that will
+be assigned the hook to be executed after `ediff-startup' is finished.
+`ediff-find-file' arranges that the temp files it might create will be
+deleted."
   (let* ((file (symbol-value file-var))
         (file-magic (ediff-filename-magic-p file))
         (temp-file-name-prefix (file-name-nondirectory file)))
@@ -1504,11 +1505,11 @@
 (run-hooks 'ediff-load-hook)
 
 
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
 
 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
 ;;; ediff.el ends here

Index: emulation/viper-keym.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-keym.el,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- emulation/viper-keym.el     5 Jan 2009 03:21:21 -0000       1.54
+++ emulation/viper-keym.el     31 Jan 2009 22:10:30 -0000      1.55
@@ -668,9 +668,9 @@
 (provide 'viper-keym)
 
 
-;;; Local Variables:
-;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
-;;; End:
+;; Local Variables:
+;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
+;; End:
 
 
 ;; arch-tag: 43af4b2f-0bea-400b-889e-221ebc00acb1

Index: emulation/viper-mous.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-mous.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- emulation/viper-mous.el     5 Jan 2009 03:21:22 -0000       1.48
+++ emulation/viper-mous.el     31 Jan 2009 22:10:30 -0000      1.49
@@ -657,9 +657,9 @@
 
 
 
-;;; Local Variables:
-;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
-;;; End:
+;; Local Variables:
+;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
+;; End:
 
 
 ;; arch-tag: e56b2390-06c4-4dd1-96f5-c7876e2d8c2f

Index: emulation/viper-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-util.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- emulation/viper-util.el     5 Jan 2009 03:21:23 -0000       1.86
+++ emulation/viper-util.el     31 Jan 2009 22:10:30 -0000      1.87
@@ -1549,9 +1549,9 @@
 
 
 
-;;; Local Variables:
-;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
-;;; End:
+;; Local Variables:
+;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
+;; End:
 
 ;; arch-tag: 7f023fd5-dd9e-4378-a397-9c179553b0e3
 ;;; viper-util.el ends here

Index: international/robin.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/robin.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- international/robin.el      5 Jan 2009 03:22:23 -0000       1.6
+++ international/robin.el      31 Jan 2009 22:10:31 -0000      1.7
@@ -260,7 +260,7 @@
 OUTPUT is a character or a string.
 For example, if you evaluate the following,
 
-(robin-define-package \"test\" \"Uppercase input characters\"
+\(robin-define-package \"test\" \"Uppercase input characters\"
   (\"a\" \"A\")
   (\"ab\" \"AB\")
   (\"ac\" \"AC\")
@@ -567,9 +567,9 @@
 
 (provide 'robin)
 
-;;; Local Variables:
-;;; coding: utf-8-emacs
-;;; End:
+;; Local Variables:
+;; coding: utf-8-emacs
+;; End:
 
 ;; arch-tag: ba995140-7436-4a57-b875-747fc340f605
 ;;; robin.el ends here

Index: progmodes/ebrowse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/ebrowse.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- progmodes/ebrowse.el        5 Jan 2009 03:23:33 -0000       1.51
+++ progmodes/ebrowse.el        31 Jan 2009 22:10:31 -0000      1.52
@@ -4489,12 +4489,12 @@
 
 (provide 'ebrowse)
 
-;;; Local variables:
-;;; eval:(put 'ebrowse-output 'lisp-indent-hook 0)
-;;; eval:(put 'ebrowse-ignoring-completion-case 'lisp-indent-hook 0)
-;;; eval:(put 'ebrowse-save-selective 'lisp-indent-hook 0)
-;;; eval:(put 'ebrowse-for-all-trees 'lisp-indent-hook 1)
-;;; End:
+;; Local variables:
+;; eval:(put 'ebrowse-output 'lisp-indent-hook 0)
+;; eval:(put 'ebrowse-ignoring-completion-case 'lisp-indent-hook 0)
+;; eval:(put 'ebrowse-save-selective 'lisp-indent-hook 0)
+;; eval:(put 'ebrowse-for-all-trees 'lisp-indent-hook 1)
+;; End:
 
 ;; arch-tag: 4fa3c8bf-1771-479b-bcd7-b029c7c9677b
 ;;; ebrowse.el ends here




reply via email to

[Prev in Thread] Current Thread [Next in Thread]