Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
fa043571
Commit
fa043571
authored
Jan 31, 2009
by
Stefan Monnier
Browse files
Follow commenting conventions.
parent
062ca6f6
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
79 additions
and
63 deletions
+79
-63
lisp/ChangeLog
lisp/ChangeLog
+15
-0
lisp/ediff-diff.el
lisp/ediff-diff.el
+5
-5
lisp/ediff-merg.el
lisp/ediff-merg.el
+5
-5
lisp/ediff-mult.el
lisp/ediff-mult.el
+5
-5
lisp/ediff-ptch.el
lisp/ediff-ptch.el
+5
-5
lisp/ediff-vers.el
lisp/ediff-vers.el
+5
-5
lisp/ediff-wind.el
lisp/ediff-wind.el
+5
-5
lisp/ediff.el
lisp/ediff.el
+15
-14
lisp/emulation/viper-keym.el
lisp/emulation/viper-keym.el
+3
-3
lisp/emulation/viper-mous.el
lisp/emulation/viper-mous.el
+3
-3
lisp/emulation/viper-util.el
lisp/emulation/viper-util.el
+3
-3
lisp/international/robin.el
lisp/international/robin.el
+4
-4
lisp/progmodes/ebrowse.el
lisp/progmodes/ebrowse.el
+6
-6
No files found.
lisp/ChangeLog
View file @
fa043571
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
...
...
lisp/ediff-diff.el
View file @
fa043571
...
...
@@ -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
lisp/ediff-merg.el
View file @
fa043571
...
...
@@ -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
lisp/ediff-mult.el
View file @
fa043571
...
...
@@ -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
lisp/ediff-ptch.el
View file @
fa043571
...
...
@@ -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
lisp/ediff-vers.el
View file @
fa043571
...
...
@@ -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
lisp/ediff-wind.el
View file @
fa043571
...
...
@@ -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
lisp/ediff.el
View file @
fa043571
...
...
@@ -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
lisp/emulation/viper-keym.el
View file @
fa043571
...
...
@@ -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
...
...
lisp/emulation/viper-mous.el
View file @
fa043571
...
...
@@ -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
...
...
lisp/emulation/viper-util.el
View file @
fa043571
...
...
@@ -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
lisp/international/robin.el
View file @
fa043571
...
...
@@ -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
lisp/progmodes/ebrowse.el
View file @
fa043571
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment