From 1cd7adc68ae35528a20418b76f13f2b84db827dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pavel=20Jan=C3=ADk?= Date: Sat, 14 Jul 2001 11:21:08 +0000 Subject: [PATCH] Emacs lisp coding convention fixes. --- lisp/ChangeLog | 16 ++++++++++++++++ lisp/arc-mode.el | 4 ++-- lisp/bindings.el | 4 ++-- lisp/cdl.el | 4 ++-- lisp/comint.el | 4 ++-- lisp/cus-start.el | 4 ++-- lisp/shell.el | 10 +++++----- lisp/skeleton.el | 4 ++-- lisp/which-func.el | 2 +- lisp/xml.el | 20 ++++++++++---------- 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 @@ +2001-07-13 Pavel Jan,Bm(Bk + + * arc-mode.el: A fix to follow coding conventions. + + * bindings.el: Ditto. + + * cdl.el: Ditto. + + * comint.el: Ditto. + + * cus-start.el: Ditto. + + * shell.el: Ditto. + + * skeleton.el: Ditto. + 2001-07-13 Stefan Monnier * 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. (string-match "\\.[aA][rR][cC]$" (or buffer-file-name (buffer-name)))) 'arc) - (t (error "Buffer format not recognized."))))) + (t (error "Buffer format not recognized"))))) ;; ------------------------------------------------------------------------- (defun archive-summarize (&optional shut-up) "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." (provide 'arc-mode) -;; arc-mode.el ends here. +;;; 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 @@ -;;; bindings.el --- define standard key bindings and some variables. +;;; bindings.el --- define standard key bindings and some variables ;; Copyright (C) 1985,86,87,92,93,94,95,96,99,2000, 2001 ;; Free Software Foundation, Inc. @@ -617,7 +617,7 @@ language you are using." ;;(defun function-key-error () ;; (interactive) -;; (error "That function key is not bound to anything.")) +;; (error "That function key is not bound to anything")) (define-key global-map [menu] 'execute-extended-command) (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 @@ -;;; cdl.el --- Common Data Language (CDL) utility functions for Gnu Emacs +;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs ;; Copyright (C) 1993 Free Software Foundation, Inc. @@ -44,4 +44,4 @@ (provide 'cdl) -;;; cdl.el ends here. +;;; 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 @@ ;; Copyright (C) 1988, 90, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001 ;; Free Software Foundation, Inc. -;; Author: Olin Shivers then +;; Author: Olin Shivers ;; Simon Marshall ;; Maintainer: FSF ;; Keywords: processes @@ -3213,4 +3213,4 @@ REGEXP-GROUP is the regular expression group in REGEXP to use." (provide 'comint) -;; comint.el ends here +;;; 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 @@ -;;; cus-start.el --- define customization properties of builtins. +;;; cus-start.el --- define customization properties of builtins ;; ;; Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc. ;; @@ -308,4 +308,4 @@ (unless purify-flag (provide 'cus-start)) -;;; cus-start.el ends here. +;;; 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 @@ -;;; shell.el --- specialized comint.el for running the shell. +;;; shell.el --- specialized comint.el for running the shell ;; Copyright (C) 1988, 93, 94, 95, 96, 1997, 2000 Free Software Foundation, Inc. -;; Author: Olin Shivers then +;; Author: Olin Shivers ;; Simon Marshall ;; Maintainer: FSF ;; Keywords: processes @@ -678,7 +678,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." (cond ((> num (length shell-dirstack)) (message "Directory stack not that deep.")) ((= num 0) - (error (message "Couldn't cd."))) + (error (message "Couldn't cd"))) (shell-pushd-dextract (let ((dir (nth (1- num) shell-dirstack))) (shell-process-popd arg) @@ -774,7 +774,7 @@ command again." (setq shell-dirstack (cdr ds) shell-last-dir (car shell-dirstack)) (shell-dirstack-message)) - (error (message "Couldn't cd."))))))) + (error (message "Couldn't cd"))))))) ;;; For your typing convenience: (defalias 'dirs 'shell-resync-dirs) @@ -1003,7 +1003,7 @@ Returns t if successful." (cond ((null index) nil) ((>= index (length stack)) - (error "Directory stack not that deep.")) + (error "Directory stack not that deep")) (t (replace-match (file-name-as-directory (nth index stack)) t t) (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."))) ;; t) ;; '(save-excursion ;; (if (re-search-forward page-delimiter nil t) -;; (error "Not on last page."))) +;; (error "Not on last page"))) ;; comment-start "Local Variables:" comment-end \n ;; comment-start "mode: " str ;; & -5 | '(kill-line 0) & -1 | comment-end \n @@ -607,4 +607,4 @@ symmetrical ones, and the same character twice for the others." (provide 'skeleton) -;; skeleton.el ends here +;;; 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 (defvar which-func-mode nil "Non-nil means display current function name in mode line. -This makes a difference only if `which-function-mode' is non-nil") +This makes a difference only if `which-function-mode' is non-nil.") (make-variable-buffer-local 'which-func-mode) ;;(put 'which-func-mode 'permanent-local t) 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 @@ -;; @(#) xml.el --- XML parser +;;; xml.el --- XML parser ;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. @@ -164,7 +164,7 @@ and returned as the first element of the list" (add-to-list 'xml result)))) ;; translation of rule [1] of XML specifications - (error "XML files can have only one toplevel tag."))) + (error "XML files can have only one toplevel tag"))) (goto-char end))) (if parse-dtd (cons dtd (reverse xml)) @@ -264,7 +264,7 @@ Returns one of: (goto-char (match-end 0)) (skip-chars-forward " \t\n") (if (> (point) end) - (error "XML: End tag for %s not found before end of region." + (error "XML: End tag for %s not found before end of region" node-name)) children ) @@ -273,7 +273,7 @@ Returns one of: (error "XML: Invalid attribute list") )))) (t ;; This is not a tag. - (error "XML: Invalid character.")) + (error "XML: Invalid character")) )) (defun xml-parse-attlist (end) @@ -291,18 +291,18 @@ Leaves the point on the first non-blank character after the tag." ;; or a simple word ? (unless (looking-at "\"\\([^\"]+\\)\"") (unless (looking-at "'\\([^\"]+\\)'") - (error "XML: Attribute values must be given between quotes."))) + (error "XML: Attribute values must be given between quotes"))) ;; Each attribute must be unique within a given element (if (assoc name attlist) - (error "XML: each attribute must be unique within an element.")) + (error "XML: each attribute must be unique within an element")) (set 'attlist (append attlist (list (cons name (match-string-no-properties 1))))) (goto-char (match-end 0)) (skip-chars-forward " \t\n") (if (> (point) end) - (error "XML: end of attribute list not found before end of region.")) + (error "XML: end of attribute list not found before end of region")) ) attlist )) @@ -350,10 +350,10 @@ The DTD must end before the position END in the current buffer." ;; External DTDs => don't know how to handle them yet (if (looking-at "SYSTEM") - (error "XML: Don't know how to handle external DTDs.")) + (error "XML: Don't know how to handle external DTDs")) (if (not (= (char-after) ?\[)) - (error "XML: Unknown declaration in the DTD.")) + (error "XML: Unknown declaration in the DTD")) ;; Parse the rest of the DTD (forward-char 1) @@ -384,7 +384,7 @@ The DTD must end before the position END in the current buffer." ;; rule [45]: the element declaration must be unique (if (assoc element dtd) - (error "XML: elements declaration must be unique in a DTD (<%s>)." + (error "XML: elements declaration must be unique in a DTD (<%s>)" (symbol-name element))) ;; Store the element in the DTD -- 2.39.2