aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPavel Janík2001-07-14 11:21:08 +0000
committerPavel Janík2001-07-14 11:21:08 +0000
commit1cd7adc68ae35528a20418b76f13f2b84db827dd (patch)
tree72fa14e562d56aba99842bdd78f10522c60a9ea8 /lisp
parent07b1b9126d535f7ce7908a05cb4da8545ac1766e (diff)
downloademacs-1cd7adc68ae35528a20418b76f13f2b84db827dd.tar.gz
emacs-1cd7adc68ae35528a20418b76f13f2b84db827dd.zip
Emacs lisp coding convention fixes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog16
-rw-r--r--lisp/arc-mode.el4
-rw-r--r--lisp/bindings.el4
-rw-r--r--lisp/cdl.el4
-rw-r--r--lisp/comint.el4
-rw-r--r--lisp/cus-start.el4
-rw-r--r--lisp/shell.el10
-rw-r--r--lisp/skeleton.el4
-rw-r--r--lisp/which-func.el2
-rw-r--r--lisp/xml.el20
10 files changed, 44 insertions, 28 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d53201863b6..db6d6a4f1d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
12001-07-13 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2
3 * arc-mode.el: A fix to follow coding conventions.
4
5 * bindings.el: Ditto.
6
7 * cdl.el: Ditto.
8
9 * comint.el: Ditto.
10
11 * cus-start.el: Ditto.
12
13 * shell.el: Ditto.
14
15 * skeleton.el: Ditto.
16
12001-07-13 Stefan Monnier <monnier@cs.yale.edu> 172001-07-13 Stefan Monnier <monnier@cs.yale.edu>
2 18
3 * info.el (Info-build-node-completions): 19 * info.el (Info-build-node-completions):
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index e814d4d40c3..3a0c2321232 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -692,7 +692,7 @@ archive.
692 (string-match "\\.[aA][rR][cC]$" 692 (string-match "\\.[aA][rR][cC]$"
693 (or buffer-file-name (buffer-name)))) 693 (or buffer-file-name (buffer-name))))
694 'arc) 694 'arc)
695 (t (error "Buffer format not recognized."))))) 695 (t (error "Buffer format not recognized")))))
696;; ------------------------------------------------------------------------- 696;; -------------------------------------------------------------------------
697(defun archive-summarize (&optional shut-up) 697(defun archive-summarize (&optional shut-up)
698 "Parse the contents of the archive file in the current buffer. 698 "Parse the contents of the archive file in the current buffer.
@@ -1744,4 +1744,4 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
1744 1744
1745(provide 'arc-mode) 1745(provide 'arc-mode)
1746 1746
1747;; arc-mode.el ends here. 1747;;; arc-mode.el ends here
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 519d2b59c30..c6cbfe767e0 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1,4 +1,4 @@
1;;; bindings.el --- define standard key bindings and some variables. 1;;; bindings.el --- define standard key bindings and some variables
2 2
3;; Copyright (C) 1985,86,87,92,93,94,95,96,99,2000, 2001 3;; Copyright (C) 1985,86,87,92,93,94,95,96,99,2000, 2001
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
@@ -617,7 +617,7 @@ language you are using."
617 617
618;;(defun function-key-error () 618;;(defun function-key-error ()
619;; (interactive) 619;; (interactive)
620;; (error "That function key is not bound to anything.")) 620;; (error "That function key is not bound to anything"))
621 621
622(define-key global-map [menu] 'execute-extended-command) 622(define-key global-map [menu] 'execute-extended-command)
623(define-key global-map [find] 'search-forward) 623(define-key global-map [find] 'search-forward)
diff --git a/lisp/cdl.el b/lisp/cdl.el
index 1f7fab27dc4..49de3db4bc2 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -1,4 +1,4 @@
1;;; cdl.el --- Common Data Language (CDL) utility functions for Gnu Emacs 1;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs
2 2
3;; Copyright (C) 1993 Free Software Foundation, Inc. 3;; Copyright (C) 1993 Free Software Foundation, Inc.
4 4
@@ -44,4 +44,4 @@
44 44
45(provide 'cdl) 45(provide 'cdl)
46 46
47;;; cdl.el ends here. 47;;; cdl.el ends here
diff --git a/lisp/comint.el b/lisp/comint.el
index ac5c20d77cb..623a40d2c3b 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -3,7 +3,7 @@
3;; Copyright (C) 1988, 90, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001 3;; Copyright (C) 1988, 90, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Olin Shivers <shivers@cs.cmu.edu> then 6;; Author: Olin Shivers <shivers@cs.cmu.edu>
7;; Simon Marshall <simon@gnu.org> 7;; Simon Marshall <simon@gnu.org>
8;; Maintainer: FSF 8;; Maintainer: FSF
9;; Keywords: processes 9;; Keywords: processes
@@ -3213,4 +3213,4 @@ REGEXP-GROUP is the regular expression group in REGEXP to use."
3213 3213
3214(provide 'comint) 3214(provide 'comint)
3215 3215
3216;; comint.el ends here 3216;;; comint.el ends here
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index ce0a2206208..c42124f4e7e 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,4 +1,4 @@
1;;; cus-start.el --- define customization properties of builtins. 1;;; cus-start.el --- define customization properties of builtins
2;; 2;;
3;; Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc. 3;; Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
4;; 4;;
@@ -308,4 +308,4 @@
308(unless purify-flag 308(unless purify-flag
309 (provide 'cus-start)) 309 (provide 'cus-start))
310 310
311;;; cus-start.el ends here. 311;;; cus-start.el ends here
diff --git a/lisp/shell.el b/lisp/shell.el
index 43b7f6ab064..f09e2c6b56e 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,8 +1,8 @@
1;;; shell.el --- specialized comint.el for running the shell. 1;;; shell.el --- specialized comint.el for running the shell
2 2
3;; Copyright (C) 1988, 93, 94, 95, 96, 1997, 2000 Free Software Foundation, Inc. 3;; Copyright (C) 1988, 93, 94, 95, 96, 1997, 2000 Free Software Foundation, Inc.
4 4
5;; Author: Olin Shivers <shivers@cs.cmu.edu> then 5;; Author: Olin Shivers <shivers@cs.cmu.edu>
6;; Simon Marshall <simon@gnu.org> 6;; Simon Marshall <simon@gnu.org>
7;; Maintainer: FSF 7;; Maintainer: FSF
8;; Keywords: processes 8;; Keywords: processes
@@ -678,7 +678,7 @@ Environment variables are expanded, see function `substitute-in-file-name'."
678 (cond ((> num (length shell-dirstack)) 678 (cond ((> num (length shell-dirstack))
679 (message "Directory stack not that deep.")) 679 (message "Directory stack not that deep."))
680 ((= num 0) 680 ((= num 0)
681 (error (message "Couldn't cd."))) 681 (error (message "Couldn't cd")))
682 (shell-pushd-dextract 682 (shell-pushd-dextract
683 (let ((dir (nth (1- num) shell-dirstack))) 683 (let ((dir (nth (1- num) shell-dirstack)))
684 (shell-process-popd arg) 684 (shell-process-popd arg)
@@ -774,7 +774,7 @@ command again."
774 (setq shell-dirstack (cdr ds) 774 (setq shell-dirstack (cdr ds)
775 shell-last-dir (car shell-dirstack)) 775 shell-last-dir (car shell-dirstack))
776 (shell-dirstack-message)) 776 (shell-dirstack-message))
777 (error (message "Couldn't cd."))))))) 777 (error (message "Couldn't cd")))))))
778 778
779;;; For your typing convenience: 779;;; For your typing convenience:
780(defalias 'dirs 'shell-resync-dirs) 780(defalias 'dirs 'shell-resync-dirs)
@@ -1003,7 +1003,7 @@ Returns t if successful."
1003 (cond ((null index) 1003 (cond ((null index)
1004 nil) 1004 nil)
1005 ((>= index (length stack)) 1005 ((>= index (length stack))
1006 (error "Directory stack not that deep.")) 1006 (error "Directory stack not that deep"))
1007 (t 1007 (t
1008 (replace-match (file-name-as-directory (nth index stack)) t t) 1008 (replace-match (file-name-as-directory (nth index stack)) t t)
1009 (message "Directory item: %d" index) 1009 (message "Directory item: %d" index)
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index df23e43a132..9c5d7173cd6 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -480,7 +480,7 @@ automatically, and you are prompted to fill in the variable parts.")))
480;; t) 480;; t)
481;; '(save-excursion 481;; '(save-excursion
482;; (if (re-search-forward page-delimiter nil t) 482;; (if (re-search-forward page-delimiter nil t)
483;; (error "Not on last page."))) 483;; (error "Not on last page")))
484;; comment-start "Local Variables:" comment-end \n 484;; comment-start "Local Variables:" comment-end \n
485;; comment-start "mode: " str 485;; comment-start "mode: " str
486;; & -5 | '(kill-line 0) & -1 | comment-end \n 486;; & -5 | '(kill-line 0) & -1 | comment-end \n
@@ -607,4 +607,4 @@ symmetrical ones, and the same character twice for the others."
607 607
608(provide 'skeleton) 608(provide 'skeleton)
609 609
610;; skeleton.el ends here 610;;; skeleton.el ends here
diff --git a/lisp/which-func.el b/lisp/which-func.el
index 1bcd0ea97c9..21420c8b03a 100644
--- a/lisp/which-func.el
+++ b/lisp/which-func.el
@@ -127,7 +127,7 @@ and you want to simplify them for the mode line
127 127
128(defvar which-func-mode nil 128(defvar which-func-mode nil
129 "Non-nil means display current function name in mode line. 129 "Non-nil means display current function name in mode line.
130This makes a difference only if `which-function-mode' is non-nil") 130This makes a difference only if `which-function-mode' is non-nil.")
131(make-variable-buffer-local 'which-func-mode) 131(make-variable-buffer-local 'which-func-mode)
132;;(put 'which-func-mode 'permanent-local t) 132;;(put 'which-func-mode 'permanent-local t)
133 133
diff --git a/lisp/xml.el b/lisp/xml.el
index a07f449b317..ac27b776b95 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -1,4 +1,4 @@
1;; @(#) xml.el --- XML parser 1;;; xml.el --- XML parser
2 2
3;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. 3;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
4 4
@@ -164,7 +164,7 @@ and returned as the first element of the list"
164 (add-to-list 'xml result)))) 164 (add-to-list 'xml result))))
165 165
166 ;; translation of rule [1] of XML specifications 166 ;; translation of rule [1] of XML specifications
167 (error "XML files can have only one toplevel tag."))) 167 (error "XML files can have only one toplevel tag")))
168 (goto-char end))) 168 (goto-char end)))
169 (if parse-dtd 169 (if parse-dtd
170 (cons dtd (reverse xml)) 170 (cons dtd (reverse xml))
@@ -264,7 +264,7 @@ Returns one of:
264 (goto-char (match-end 0)) 264 (goto-char (match-end 0))
265 (skip-chars-forward " \t\n") 265 (skip-chars-forward " \t\n")
266 (if (> (point) end) 266 (if (> (point) end)
267 (error "XML: End tag for %s not found before end of region." 267 (error "XML: End tag for %s not found before end of region"
268 node-name)) 268 node-name))
269 children 269 children
270 ) 270 )
@@ -273,7 +273,7 @@ Returns one of:
273 (error "XML: Invalid attribute list") 273 (error "XML: Invalid attribute list")
274 )))) 274 ))))
275 (t ;; This is not a tag. 275 (t ;; This is not a tag.
276 (error "XML: Invalid character.")) 276 (error "XML: Invalid character"))
277 )) 277 ))
278 278
279(defun xml-parse-attlist (end) 279(defun xml-parse-attlist (end)
@@ -291,18 +291,18 @@ Leaves the point on the first non-blank character after the tag."
291 ;; or a simple word ? 291 ;; or a simple word ?
292 (unless (looking-at "\"\\([^\"]+\\)\"") 292 (unless (looking-at "\"\\([^\"]+\\)\"")
293 (unless (looking-at "'\\([^\"]+\\)'") 293 (unless (looking-at "'\\([^\"]+\\)'")
294 (error "XML: Attribute values must be given between quotes."))) 294 (error "XML: Attribute values must be given between quotes")))
295 295
296 ;; Each attribute must be unique within a given element 296 ;; Each attribute must be unique within a given element
297 (if (assoc name attlist) 297 (if (assoc name attlist)
298 (error "XML: each attribute must be unique within an element.")) 298 (error "XML: each attribute must be unique within an element"))
299 299
300 (set 'attlist (append attlist 300 (set 'attlist (append attlist
301 (list (cons name (match-string-no-properties 1))))) 301 (list (cons name (match-string-no-properties 1)))))
302 (goto-char (match-end 0)) 302 (goto-char (match-end 0))
303 (skip-chars-forward " \t\n") 303 (skip-chars-forward " \t\n")
304 (if (> (point) end) 304 (if (> (point) end)
305 (error "XML: end of attribute list not found before end of region.")) 305 (error "XML: end of attribute list not found before end of region"))
306 ) 306 )
307 attlist 307 attlist
308 )) 308 ))
@@ -350,10 +350,10 @@ The DTD must end before the position END in the current buffer."
350 350
351 ;; External DTDs => don't know how to handle them yet 351 ;; External DTDs => don't know how to handle them yet
352 (if (looking-at "SYSTEM") 352 (if (looking-at "SYSTEM")
353 (error "XML: Don't know how to handle external DTDs.")) 353 (error "XML: Don't know how to handle external DTDs"))
354 354
355 (if (not (= (char-after) ?\[)) 355 (if (not (= (char-after) ?\[))
356 (error "XML: Unknown declaration in the DTD.")) 356 (error "XML: Unknown declaration in the DTD"))
357 357
358 ;; Parse the rest of the DTD 358 ;; Parse the rest of the DTD
359 (forward-char 1) 359 (forward-char 1)
@@ -384,7 +384,7 @@ The DTD must end before the position END in the current buffer."
384 384
385 ;; rule [45]: the element declaration must be unique 385 ;; rule [45]: the element declaration must be unique
386 (if (assoc element dtd) 386 (if (assoc element dtd)
387 (error "XML: elements declaration must be unique in a DTD (<%s>)." 387 (error "XML: elements declaration must be unique in a DTD (<%s>)"
388 (symbol-name element))) 388 (symbol-name element)))
389 389
390 ;; Store the element in the DTD 390 ;; Store the element in the DTD