Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99497. ------------------------------------------------------------ revno: 99497 [merge] committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2010-02-14 18:34:09 +0100 message: Fix typos. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2010-01-20 03:49:35 +0000 +++ admin/ChangeLog 2010-02-14 17:30:41 +0000 @@ -1,3 +1,7 @@ +2010-02-14 Juanma Barranquero + + * quick-install-emacs (PRUNED): Fix typo in message. + 2010-01-20 Glenn Morris * revdiff: Remove file that only works with CVS, and isn't really === modified file 'admin/quick-install-emacs' --- admin/quick-install-emacs 2010-01-13 08:35:10 +0000 +++ admin/quick-install-emacs 2010-02-14 17:30:41 +0000 @@ -276,7 +276,7 @@ if [ -d $DST/$DIR ]; then echo Directory $DST/$DIR exists else - echo Directory $DST/$DIR non-existant + echo Directory $DST/$DIR non-existent if [ "`echo $DIR | egrep -v "$AVOID_PAT"`" ]; then maybe_mkdir $DST/$DIR fi === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-02-08 07:20:58 +0000 +++ doc/emacs/ChangeLog 2010-02-14 17:31:34 +0000 @@ -33,7 +33,7 @@ * building.texi (Grep Searching): Document zrgrep. - * mini.texi (Completion Options): Mention `initals' completion style. + * mini.texi (Completion Options): Mention `initials' completion style. 2009-12-29 Nick Roberts === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-14 09:23:52 +0000 +++ lisp/ChangeLog 2010-02-14 17:28:10 +0000 @@ -1,3 +1,17 @@ +2010-02-14 Juanma Barranquero + + * outline.el (outline-head-from-level): + * simple.el (with-wrapper-hook): + * cedet/ede.el (ede-run-target, project-delete-target) + (project-dist-files, ede-name, ede-documentation, ede-parent-project) + (ede-adebug-project, ede-adebug-project-parent) + (ede-adebug-project-root): + * emacs-lisp/elint.el (elint-extra-errors, elint-current-buffer) + (elint-defun, elint-buffer-env, elint-top-form-logged) + (elint-unbound-variable): + * textmodes/reftex-toc.el (reftex-toc-newhead-from-alist): + Fix typos in docstrings. + 2010-02-14 Michael Albinus * files.el (insert-directory): When WILDCARD-REGEXP and === modified file 'lisp/ChangeLog.13' --- lisp/ChangeLog.13 2010-01-13 08:35:10 +0000 +++ lisp/ChangeLog.13 2010-02-14 17:31:34 +0000 @@ -7242,7 +7242,7 @@ * subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers. - * pcvs.el (cvs-revert-if-needed): Ignore `unknown' files, since cvs + * pcvs.el (cvs-revert-if-needed): Ignore `unknown' files, since CVS did not touch them. 2007-11-15 Jay Belanger === modified file 'lisp/ChangeLog.8' --- lisp/ChangeLog.8 2010-01-14 18:29:36 +0000 +++ lisp/ChangeLog.8 2010-02-14 17:31:34 +0000 @@ -4729,7 +4729,7 @@ 1999-07-08 Espen Skoglund - * pascal.el (pascal-calculate-indent): Fixed a bug occuring when + * pascal.el (pascal-calculate-indent): Fixed a bug occurring when the `end' keyword was in the very beginning of the buffer. 1999-07-08 Richard Stallman === modified file 'lisp/cedet/ede.el' --- lisp/cedet/ede.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/ede.el 2010-02-14 17:28:10 +0000 @@ -1155,7 +1155,7 @@ (ede-invoke-method 'project-debug-target)) (defun ede-run-target () - "Debug the current buffer's assocated target." + "Run the current buffer's associated target." (interactive) (ede-invoke-method 'project-run-target)) @@ -1381,7 +1381,7 @@ (error "New-target-custom not supported by %s" (object-name proj))) (defmethod project-delete-target ((ot ede-target)) - "Delete the current target OT from it's parent project." + "Delete the current target OT from its parent project." (error "add-file not supported by %s" (object-name ot))) (defmethod project-compile-project ((obj ede-project) &optional command) @@ -1407,7 +1407,7 @@ (error "Make-dist not supported by %s" (object-name this))) (defmethod project-dist-files ((this ede-project)) - "Return a list of files that constitutes a distribution of THIS project." + "Return a list of files that constitute a distribution of THIS project." (error "Dist-files is not supported by %s" (object-name this))) (defmethod project-rescan ((this ede-project)) @@ -1421,7 +1421,7 @@ ;; b) cosmetic. (defmethod ede-name ((this ede-target)) - "Return the name of THIS targt." + "Return the name of THIS target." (oref this name)) (defmethod ede-target-name ((this ede-target)) @@ -1510,7 +1510,7 @@ (ede-buffer-documentation-files cp (current-buffer)))))) (defmethod ede-documentation ((this ede-project)) - "Return a list of files that provides documentation. + "Return a list of files that provide documentation. Documentation is not for object THIS, but is provided by THIS for other files in the project." (let ((targ (oref this targets)) @@ -1525,7 +1525,7 @@ found)) (defmethod ede-documentation ((this ede-target)) - "Return a list of files that provides documentation. + "Return a list of files that provide documentation. Documentation is not for object THIS, but is provided by THIS for other files in the project." nil) @@ -1651,7 +1651,7 @@ (defun ede-parent-project (&optional obj) "Return the project belonging to the parent directory. -nil if there is no previous directory. +Returns nil if there is no previous directory. Optional argument OBJ is an object to find the parent of." (let* ((proj (or obj ede-object-project)) ;; Current project. (root (if obj (ede-project-root obj) @@ -1952,7 +1952,7 @@ ;;; Debugging. (defun ede-adebug-project () - "Run adebug against the current ede project. + "Run adebug against the current EDE project. Display the results as a debug list." (interactive) (require 'data-debug) @@ -1962,7 +1962,7 @@ )) (defun ede-adebug-project-parent () - "Run adebug against the current ede parent project. + "Run adebug against the current EDE parent project. Display the results as a debug list." (interactive) (require 'data-debug) @@ -1972,7 +1972,7 @@ )) (defun ede-adebug-project-root () - "Run adebug against the current ede parent project. + "Run adebug against the current EDE parent project. Display the results as a debug list." (interactive) (require 'data-debug) @@ -1983,7 +1983,7 @@ ;;; Hooks & Autoloads ;; -;; These let us watch various activities, and respond apropriatly. +;; These let us watch various activities, and respond appropriately. ;; (add-hook 'edebug-setup-hook ;; (lambda () === modified file 'lisp/cedet/semantic/complete.el' --- lisp/cedet/semantic/complete.el 2010-01-16 02:51:50 +0000 +++ lisp/cedet/semantic/complete.el 2010-02-14 17:32:16 +0000 @@ -1243,7 +1243,7 @@ ;; A typical displayor accepts a pre-determined list of completions ;; generated by a collector. This format is in semanticdb search ;; form. This vaguely standard form is a bit challenging to navigate -;; because the tags do not contain buffer info, but the file assocated +;; because the tags do not contain buffer info, but the file associated ;; with the tags preceed the tag in the list. ;; ;; Basic displayors don't care, and can strip the results. === modified file 'lisp/cedet/srecode/insert.el' --- lisp/cedet/srecode/insert.el 2010-01-14 18:59:31 +0000 +++ lisp/cedet/srecode/insert.el 2010-02-14 17:32:16 +0000 @@ -190,7 +190,7 @@ ;;; TEMPLATE ARGUMENTS ;; -;; Some templates have arguments. Each argument is assocaited with +;; Some templates have arguments. Each argument is associated with ;; a function that can resolve the inputs needed. (defun srecode-resolve-arguments (temp dict) "Resolve all the arguments needed by the template TEMP. === modified file 'lisp/emacs-lisp/elint.el' --- lisp/emacs-lisp/elint.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/elint.el 2010-02-14 17:28:10 +0000 @@ -147,7 +147,7 @@ "Those built-ins for which we can't find arguments, if any.") (defvar elint-extra-errors '(file-locked file-supersession ftp-error) - "Errors without error-message or error-confitions properties.") + "Errors without `error-message' or `error-conditions' properties.") (defconst elint-preloaded-skip-re (regexp-opt '("loaddefs.el" "loadup.el" "cus-start" "language/" @@ -289,7 +289,7 @@ ;;;###autoload (defun elint-current-buffer () "Lint the current buffer. -If necessary, this first calls `elint-initalize'." +If necessary, this first calls `elint-initialize'." (interactive) (or elint-builtin-variables (elint-initialize)) @@ -308,7 +308,7 @@ ;;;###autoload (defun elint-defun () "Lint the function at point. -If necessary, this first calls `elint-initalize'." +If necessary, this first calls `elint-initialize'." (interactive) (or elint-builtin-variables (elint-initialize)) @@ -325,7 +325,7 @@ ;;; (defvar elint-buffer-env nil - "The environment of a elisp buffer. + "The environment of an elisp buffer. Will be local in linted buffers.") (defvar elint-buffer-forms nil @@ -528,7 +528,7 @@ "The currently linted top form, or nil.") (defvar elint-top-form-logged nil - "T if the currently linted top form has been mentioned in the log buffer.") + "The value t if the currently linted top form has been mentioned in the log buffer.") (defun elint-top-form (form) "Lint a top FORM." @@ -640,7 +640,7 @@ "Name of a temporarily bound symbol.") (defun elint-unbound-variable (var env) - "T if VAR is unbound in ENV." + "Return t if VAR is unbound in ENV." ;; #1063 suggests adding (symbol-file var) here, but I don't think ;; this is right, because it depends on what files you happen to have ;; loaded at the time, which might not be the same when the code runs. === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2010-01-14 18:59:31 +0000 +++ lisp/org/ChangeLog 2010-02-14 17:31:34 +0000 @@ -748,7 +748,7 @@ next clock in, the user will be prompted to see if they want to back-date their new clock to then. (org-clock-resolve): Do not jump the user to the location of a - dangling clock if the resolution is occuring due to an idle + dangling clock if the resolution is occurring due to an idle timeout. In that case there is typically only one dangling clock, the active one, and there is no value gained by shuffling their windows around to show it to them. Being prompted to resolve an === modified file 'lisp/outline.el' --- lisp/outline.el 2010-01-13 08:35:10 +0000 +++ lisp/outline.el 2010-02-14 17:28:10 +0000 @@ -595,7 +595,7 @@ ALIST defaults to `outline-heading-alist'. Similar to (car (rassoc LEVEL ALIST)). If there are several different entries with same new level, choose -the one with the smallest distance to the assocation of HEAD in the alist. +the one with the smallest distance to the association of HEAD in the alist. This makes it possible for promotion to work in modes with several independent sets of headings (numbered, unnumbered, appendix...)" (unless alist (setq alist outline-heading-alist)) === modified file 'lisp/simple.el' --- lisp/simple.el 2010-02-13 19:29:25 +0000 +++ lisp/simple.el 2010-02-14 17:28:10 +0000 @@ -6552,7 +6552,7 @@ a hook, with a buffer-local and a global part. But it can also be an arbitrary expression. ARGS is a list of variables which will be passed as additional arguments -to each function, after the inital argument, and which the first argument +to each function, after the initial argument, and which the first argument expects to receive when called." (declare (indent 2) (debug t)) ;; We need those two gensyms because CL's lexical scoping is not available === modified file 'lisp/textmodes/reftex-toc.el' --- lisp/textmodes/reftex-toc.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/reftex-toc.el 2010-02-14 17:28:10 +0000 @@ -723,8 +723,8 @@ (defun reftex-toc-newhead-from-alist (nlevel head alist) "Get new heading with level NLEVEL from ALIST. If there are no such entries, return nil. -If there are several different entries with same new level, choose -the one with the smallest distance to the assocation of HEAD in the alist. +If there are several different entries with same new level, choose the +one with the smallest distance to the association of HEAD in the alist. This makes it possible for promotion to work several sets of headings, if these sets are sorted blocks in the alist." (let* ((al alist) === modified file 'src/ccl.c' --- src/ccl.c 2010-01-13 08:35:10 +0000 +++ src/ccl.c 2010-02-14 17:32:16 +0000 @@ -43,7 +43,7 @@ /* Alist of fontname patterns vs corresponding CCL program. */ Lisp_Object Vfont_ccl_encoder_alist; -/* This symbol is a property which assocates with ccl program vector. +/* This symbol is a property which associates with ccl program vector. Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. */ Lisp_Object Qccl_program; ------------------------------------------------------------ revno: 99496 committer: Michael Albinus branch nick: trunk timestamp: Sun 2010-02-14 10:23:52 +0100 message: * files.el (insert-directory): When WILDCARD-REGEXP and FULL-DIRECTORY-P are nil, insert the file entry instead of the whole directory. (Bug#5551) * net/ange-ftp.el (ange-ftp-insert-directory): Insert " " for dired's alignment sanity. (Bug#5516) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-14 00:20:31 +0000 +++ lisp/ChangeLog 2010-02-14 09:23:52 +0000 @@ -1,3 +1,12 @@ +2010-02-14 Michael Albinus + + * files.el (insert-directory): When WILDCARD-REGEXP and + FULL-DIRECTORY-P are nil, insert the file entry instead of the + whole directory. (Bug#5551) + + * net/ange-ftp.el (ange-ftp-insert-directory): Insert " " for + dired's alignment sanity. (Bug#5516) + 2010-02-14 Juri Linkov * man.el (Man-fontify-manpage, Man-cleanup-manpage): === modified file 'lisp/files.el' --- lisp/files.el 2010-01-27 03:36:36 +0000 +++ lisp/files.el 2010-02-14 09:23:52 +0000 @@ -5699,6 +5699,11 @@ (shell-quote-wildcard-pattern pattern)))) ;; SunOS 4.1.3, SVr4 and others need the "." to list the ;; directory if FILE is a symbolic link. + (unless full-directory-p + (setq switches + (if (stringp switches) + (concat switches " -d") + (add-to-list 'switches "-d" 'append)))) (apply 'call-process insert-directory-program nil t nil (append === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2010-02-05 11:15:28 +0000 +++ lisp/net/ange-ftp.el 2010-02-14 09:23:52 +0000 @@ -4517,44 +4517,54 @@ ;; because some FTP servers react to "ls foo" by listing the symlink foo ;; rather than the directory it points to. Now that ange-ftp-ls uses ;; "cd foo; ls" instead, this is not necesssary any more. - (insert - (cond - (wildcard - (let ((default-directory (file-name-directory file))) - (ange-ftp-ls (file-name-nondirectory file) switches nil nil t))) - (full - (ange-ftp-ls file switches 'parse)) - (t - ;; If `full' is nil we're going to do `ls' for a single file. - ;; Problem is that for various reasons, ange-ftp-ls needs to cd and - ;; then do an ls of current dir, which obviously won't work if we - ;; want to ls a file. So instead, we get a full listing of the - ;; parent directory and extract the line corresponding to `file'. - (when (string-match "-?d\\'" switches) - ;; Remove "d" which dired added to `switches'. - (setq switches (substring switches 0 (match-beginning 0)))) - (setq file (directory-file-name file)) - (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".") - switches 'parse)) - (filename (file-name-nondirectory file)) - (case-fold-search nil)) - ;; FIXME: This presumes a particular output format, which is - ;; basically Unix. - (if (string-match (concat "^.+[^ ] " (regexp-quote filename) - "\\( -> .*\\)?[@/*=]?\n") dirlist) - (match-string 0 dirlist) - ""))))) - - ;; The inserted file could be from somewhere else. - (when (and (not wildcard) (not full) - (search-backward - (if (zerop (length (file-name-nondirectory - (expand-file-name file)))) - "." - (file-name-nondirectory file)) - nil 'noerror)) - (replace-match (file-relative-name (expand-file-name file)) t) - (goto-char (point-max))))) + (let ((beg (point)) + (end (point-marker))) + (set-marker-insertion-type end t) + (insert + (cond + (wildcard + (let ((default-directory (file-name-directory file))) + (ange-ftp-ls (file-name-nondirectory file) switches nil nil t))) + (full + (ange-ftp-ls file switches 'parse)) + (t + ;; If `full' is nil we're going to do `ls' for a single file. + ;; Problem is that for various reasons, ange-ftp-ls needs to cd and + ;; then do an ls of current dir, which obviously won't work if we + ;; want to ls a file. So instead, we get a full listing of the + ;; parent directory and extract the line corresponding to `file'. + (when (string-match "-?d\\'" switches) + ;; Remove "d" which dired added to `switches'. + (setq switches (substring switches 0 (match-beginning 0)))) + (setq file (directory-file-name file)) + (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".") + switches 'parse)) + (filename (file-name-nondirectory file)) + (case-fold-search nil)) + ;; FIXME: This presumes a particular output format, which is + ;; basically Unix. + (if (string-match (concat "^.+[^ ] " (regexp-quote filename) + "\\( -> .*\\)?[@/*=]?\n") dirlist) + (match-string 0 dirlist) + ""))))) + + ;; Insert " " for dired's alignment sanity. + (goto-char beg) + (while (re-search-forward "^\\(\\S-\\)" end 'move) + (replace-match " \\1")) + + ;; The inserted file could be from somewhere else. + (when (and (not wildcard) (not full) + (search-backward + (if (zerop (length (file-name-nondirectory + (expand-file-name file)))) + "." + (file-name-nondirectory file)) + nil 'noerror)) + (replace-match (file-relative-name (expand-file-name file)) t) + (goto-char end)) + + (set-marker end nil)))) (defun ange-ftp-dired-uncache (dir) (if (ange-ftp-ftp-name (expand-file-name dir)) ------------------------------------------------------------ revno: 99495 committer: Juri Linkov branch nick: trunk timestamp: Sun 2010-02-14 02:20:31 +0200 message: * man.el (Man-fontify-manpage, Man-cleanup-manpage): Remove remaining ^H with their preceding chars. (Bug#5566) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-13 19:29:25 +0000 +++ lisp/ChangeLog 2010-02-14 00:20:31 +0000 @@ -1,3 +1,8 @@ +2010-02-14 Juri Linkov + + * man.el (Man-fontify-manpage, Man-cleanup-manpage): + Remove remaining ^H with their preceding chars. (Bug#5566) + 2010-02-13 Glenn Morris * simple.el (transpose-subr): Give it a doc-string. === modified file 'lisp/man.el' --- lisp/man.el 2010-02-11 16:00:01 +0000 +++ lisp/man.el 2010-02-14 00:20:31 +0000 @@ -1087,6 +1087,11 @@ (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+") (put-text-property (1- (point)) (point) 'face 'bold)) + ;; When the header is longer than the manpage name, groff tries to + ;; condense it to a shorter line interspered with ^H. Remove ^H with + ;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566) + (goto-char (point-min)) + (while (re-search-forward ".\b" nil t) (backward-delete-char 2)) (goto-char (point-min)) ;; Try to recognize common forms of cross references. (Man-highlight-references) @@ -1174,6 +1179,11 @@ )) (goto-char (point-min)) (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+")) + ;; When the header is longer than the manpage name, groff tries to + ;; condense it to a shorter line interspered with ^H. Remove ^H with + ;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566) + (goto-char (point-min)) + (while (re-search-forward ".\b" nil t) (backward-delete-char 2)) (Man-softhyphen-to-minus) (message "%s man page cleaned up" Man-arguments)) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.