From: Stefan Monnier Date: Sat, 31 Jan 2009 22:10:22 +0000 (+0000) Subject: Follow commenting conventions. X-Git-Tag: emacs-pretest-23.0.90~19 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa043571b26751e8e6cb9bb246ecd0aafacd1ca7;p=emacs.git Follow commenting conventions. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d69bd444b3a..3d3de0b1efe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2009-01-31 Stefan Monnier + + * 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 * mail/rmail.el (rmail-redecode-body): Use eight-bit instead of diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 268ff8c0715..75379f3da7a 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -1529,11 +1529,11 @@ affects only files whose names match the expression." -;;; 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 diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 20c77448da6..35ea4348d0e 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -385,11 +385,11 @@ Combining is done according to the specifications in variable (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 diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index ebbfb1ce1c7..b9ffb373766 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -2396,11 +2396,11 @@ for operation, or simply indicate which are equal files. If it is nil, then -;;; 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 diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 7447890daee..9ae663df68d 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -834,11 +834,11 @@ you can still examine the changes via M-x ediff-files" -;;; 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 diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 24e936e1f2f..a3a855278e3 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -232,11 +232,11 @@ comparison or merge operations are being performed." (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 diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 66cc4a104c6..708fb413d3e 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -1303,11 +1303,11 @@ It assumes that it is called from within the control buffer." (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 diff --git a/lisp/ediff.el b/lisp/ediff.el index f302d868373..1b76db41449 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -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 @@ With optional NODE, goes to that node." (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 diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 0ac754e2a0f..31f8deb5d34 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -668,9 +668,9 @@ form ((key . function) (key . function) ... )." (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 diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el index c35c776eac4..1923cbc9ddc 100644 --- a/lisp/emulation/viper-mous.el +++ b/lisp/emulation/viper-mous.el @@ -657,9 +657,9 @@ This buffer may be different from the one where the click occurred." -;;; 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 diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 26b5241843a..1ee1acaee98 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -1549,9 +1549,9 @@ This option is appropriate if you like Emacs-style words." -;;; 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 diff --git a/lisp/international/robin.el b/lisp/international/robin.el index 701155b7d07..ab8c0e2230a 100644 --- a/lisp/international/robin.el +++ b/lisp/international/robin.el @@ -260,7 +260,7 @@ KEY is a string. 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 @@ used." (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 diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el index 82a994fcbbe..452e8e31de9 100644 --- a/lisp/progmodes/ebrowse.el +++ b/lisp/progmodes/ebrowse.el @@ -4489,12 +4489,12 @@ EVENT is the mouse event." (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