Mercurial > emacs

changeset 101721:c55394eee0de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Follow commenting conventions.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 31 Jan 2009 22:10:22 +0000
parents 02a61aa59953
children c65ecdf80c27
files lisp/ChangeLog lisp/ediff-diff.el lisp/ediff-merg.el lisp/ediff-mult.el lisp/ediff-ptch.el lisp/ediff-vers.el lisp/ediff-wind.el lisp/ediff.el lisp/emulation/viper-keym.el lisp/emulation/viper-mous.el lisp/emulation/viper-util.el lisp/international/robin.el lisp/progmodes/ebrowse.el
diffstat 13 files changed, 79 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/ChangeLog	Sat Jan 31 22:10:22 2009 +0000
@@ -1,3 +1,18 @@
+2009-01-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* 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  <eliz@gnu.org>
 
 	* mail/rmail.el (rmail-redecode-body): Use eight-bit instead of
--- a/lisp/ediff-diff.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/ediff-diff.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/ediff-merg.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/ediff-merg.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/ediff-mult.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/ediff-mult.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/ediff-ptch.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/ediff-ptch.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/ediff-vers.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/ediff-vers.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/ediff-wind.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/ediff-wind.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/ediff.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/ediff.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/emulation/viper-keym.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/emulation/viper-keym.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/emulation/viper-mous.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/emulation/viper-mous.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/emulation/viper-util.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/emulation/viper-util.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/international/robin.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/international/robin.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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
--- a/lisp/progmodes/ebrowse.el	Sat Jan 31 18:53:50 2009 +0000
+++ b/lisp/progmodes/ebrowse.el	Sat Jan 31 22:10:22 2009 +0000
@@ -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