Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 104217. ------------------------------------------------------------ revno: 104217 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2011-05-13 05:35:56 +0000 message: gnus-html.el (gnus-html-put-image): Register a displayer. shr.el (shr-image-displayer): Don't remove text props from alt text. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-13 04:12:37 +0000 +++ lisp/gnus/ChangeLog 2011-05-13 05:35:56 +0000 @@ -1,3 +1,9 @@ +2011-05-13 Katsumi Yamaoka + + * gnus-html.el (gnus-html-put-image): Register a displayer. + + * shr.el (shr-image-displayer): Don't remove text props from alt text. + 2011-05-13 Teodor Zlatanov * registry.el (prune-factor): New initialization parameter defaulting === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2011-05-10 03:14:44 +0000 +++ lisp/gnus/gnus-html.el 2011-05-13 05:35:56 +0000 @@ -482,8 +482,14 @@ (gnus-put-text-property start (point) 'gnus-alt-text alt-text) (when url - (gnus-put-text-property start (point) - 'image-url url)) + (gnus-add-text-properties + start (point) + `(image-url + ,url + image-displayer + (lambda (url start end) + (gnus-html-display-image ,url ,start ,(point) + ,alt-text))))) (gnus-add-image 'external image) t) ;; Bad image, try to show something else === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-05-10 13:57:12 +0000 +++ lisp/gnus/shr.el 2011-05-13 05:35:56 +0000 @@ -582,7 +582,7 @@ (when image (goto-char start) (funcall shr-put-image-function - image (buffer-substring-no-properties start end)) + image (buffer-substring start end)) (delete-region (point) end)))) (url-retrieve url 'shr-image-fetched (list (current-buffer) start end) ------------------------------------------------------------ revno: 104216 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2011-05-13 04:12:37 +0000 message: registry.el (prune-factor): New initialization parameter defaulting to 0.1. (registry-prune-hard): Use it. gnus-registry.el (gnus-registry-fixup-registry): Set prune-factor to 0.1 expicitly. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-13 02:10:17 +0000 +++ lisp/gnus/ChangeLog 2011-05-13 04:12:37 +0000 @@ -1,3 +1,12 @@ +2011-05-13 Teodor Zlatanov + + * registry.el (prune-factor): New initialization parameter defaulting + to 0.1. + (registry-prune-hard): Use it. + + * gnus-registry.el (gnus-registry-fixup-registry): Set prune-factor to + 0.1 expicitly. + 2011-05-13 Glenn Morris * message.el (message-send-mail-with-sendmail): Assume sendmail-program === modified file 'lisp/gnus/gnus-registry.el' --- lisp/gnus/gnus-registry.el 2011-05-09 22:27:17 +0000 +++ lisp/gnus/gnus-registry.el 2011-05-13 04:12:37 +0000 @@ -244,6 +244,8 @@ (oset db :max-hard (or gnus-registry-max-entries most-positive-fixnum)) + (oset db :prune-factor + 0.1) (oset db :max-soft (or gnus-registry-max-pruned-entries most-positive-fixnum)) === modified file 'lisp/gnus/registry.el' --- lisp/gnus/registry.el 2011-05-11 22:12:27 +0000 +++ lisp/gnus/registry.el 2011-05-13 04:12:37 +0000 @@ -116,6 +116,12 @@ :type integer :custom integer :documentation "Prune as much as possible to get to this size.") + (prune-factor + :initarg :prune-factor + :initform 0.1 + :type float + :custom float + :documentation "At the max-hard limit, prune size * this entries.") (tracked :initarg :tracked :initform nil :type t @@ -357,11 +363,12 @@ (defmethod registry-prune-hard-candidates ((db registry-db)) "Collects pruning candidates from the registry-db object THIS. -Proposes any entries over the max-hard limit minus 10." +Proposes any entries over the max-hard limit minus size * prune-factor." (let* ((data (oref db :data)) - ;; prune to 10 below the max-hard limit so we're not - ;; pruning all the time - (limit (- (oref db :max-hard) 10)) + ;; prune to (size * prune-factor) below the max-hard limit so + ;; we're not pruning all the time + (limit (max 0 (- (oref db :max-hard) + (* (registry-size db) (oref db :prune-factor))))) (candidates (loop for k being the hash-keys of data collect k))) (list limit candidates)))) ------------------------------------------------------------ revno: 104215 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 19:16:09 -0700 message: * lisp/gnus/message.el (sendmail-program): Declare. diff: === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-05-13 02:10:17 +0000 +++ lisp/gnus/message.el 2011-05-13 02:16:09 +0000 @@ -4621,6 +4621,8 @@ (set-buffer mailbuf) (push 'mail message-sent-message-via))) +(defvar sendmail-program) + (defun message-send-mail-with-sendmail () "Send off the prepared buffer with sendmail." (require 'sendmail) ------------------------------------------------------------ revno: 104214 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 19:10:17 -0700 message: message.el trivia. * lisp/gnu/message.el (message-send-mail-with-sendmail): Assume sendmail-program is bound, since this function requires sendmail. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-12 16:30:17 +0000 +++ lisp/gnus/ChangeLog 2011-05-13 02:10:17 +0000 @@ -1,3 +1,8 @@ +2011-05-13 Glenn Morris + + * message.el (message-send-mail-with-sendmail): Assume sendmail-program + is bound, since this function requires sendmail. + 2011-05-11 Teodor Zlatanov * registry.el (registry-usage-test): Disable pruning test. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-04-15 12:42:51 +0000 +++ lisp/gnus/message.el 2011-05-13 02:10:17 +0000 @@ -4656,16 +4656,7 @@ (cpr (apply 'call-process-region (append - (list (point-min) (point-max) - (cond ((boundp 'sendmail-program) - sendmail-program) - ((file-exists-p "/usr/sbin/sendmail") - "/usr/sbin/sendmail") - ((file-exists-p "/usr/lib/sendmail") - "/usr/lib/sendmail") - ((file-exists-p "/usr/ucblib/sendmail") - "/usr/ucblib/sendmail") - (t "fakemail")) + (list (point-min) (point-max) sendmail-program nil errbuf nil "-oi") message-sendmail-extra-arguments ;; Always specify who from, ------------------------------------------------------------ revno: 104213 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 19:06:35 -0700 message: * lisp/mail/feedmail.el (feedmail-buffer-to-sendmail): Require sendmail. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-13 01:42:24 +0000 +++ lisp/ChangeLog 2011-05-13 02:06:35 +0000 @@ -1,5 +1,7 @@ 2011-05-13 Glenn Morris + * mail/feedmail.el (feedmail-buffer-to-sendmail): Require sendmail. + * mail/sendmail.el (sendmail-program): Try executable-find first. (sendmail-send-it): sendmail-program cannot be unbound. === modified file 'lisp/mail/feedmail.el' --- lisp/mail/feedmail.el 2011-01-15 23:16:57 +0000 +++ lisp/mail/feedmail.el 2011-05-13 02:06:35 +0000 @@ -1312,22 +1312,16 @@ (mapconcat 'identity addr-listoid " ")))))) +(defvar sendmail-program) + (defun feedmail-buffer-to-sendmail (prepped errors-to addr-listoid) "Function which actually calls sendmail as a subprocess. Feeds the buffer to it. Probably has some flaws for Resent-* and other complicated cases." + (require 'sendmail) (set-buffer prepped) (apply 'call-process-region - (append (list (point-min) (point-max) - (cond ((boundp 'sendmail-program) - sendmail-program) - ((file-exists-p "/usr/sbin/sendmail") - "/usr/sbin/sendmail") - ((file-exists-p "/usr/lib/sendmail") - "/usr/lib/sendmail") - ((file-exists-p "/usr/ucblib/sendmail") - "/usr/ucblib/sendmail") - (t "fakemail")) + (append (list (point-min) (point-max) sendmail-program nil errors-to nil "-oi" "-t") ;; provide envelope "from" to sendmail; results will vary (list "-f" user-mail-address) ------------------------------------------------------------ revno: 104212 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 18:42:24 -0700 message: sendmail.el trivia. * lisp/mail/sendmail.el (sendmail-program): Try executable-find first. (sendmail-send-it): sendmail-program cannot be unbound. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-13 01:38:31 +0000 +++ lisp/ChangeLog 2011-05-13 01:42:24 +0000 @@ -1,5 +1,8 @@ 2011-05-13 Glenn Morris + * mail/sendmail.el (sendmail-program): Try executable-find first. + (sendmail-send-it): sendmail-program cannot be unbound. + * calendar/appt.el (appt-make-list): Simplify. (appt-time-msg-list): Doc fix. (appt-check): Change mode-line message at the time of the appointment. === modified file 'lisp/mail/sendmail.el' --- lisp/mail/sendmail.el 2011-05-07 17:58:40 +0000 +++ lisp/mail/sendmail.el 2011-05-13 01:42:24 +0000 @@ -43,12 +43,14 @@ :version "22.1") (defcustom sendmail-program - (cond - ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail") - ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail") - ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") - (t "fakemail")) ;In ../etc, to interface to /bin/mail. + (or (executable-find "sendmail") + (cond + ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail") + ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail") + ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") + (t "fakemail"))) ; in lib-src, to interface to /bin/mail "Program used to send messages." + :version "24.1" ; added executable-find :group 'mail :type 'file) @@ -1037,9 +1039,6 @@ delimline fcc-was-found (mailbuf (current-buffer)) - (program (if (boundp 'sendmail-program) - sendmail-program - "/usr/lib/sendmail")) ;; Examine these variables now, so that ;; local binding in the mail buffer will take effect. (envelope-from @@ -1165,7 +1164,7 @@ (coding-system-for-write selected-coding) (args (append (list (point-min) (point-max) - program + sendmail-program nil errbuf nil "-oi") (and envelope-from (list "-f" envelope-from)) ------------------------------------------------------------ revno: 104211 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 18:38:31 -0700 message: * calendar/appt.el (appt-check): Change mode-line message at time of the appt. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-13 01:35:11 +0000 +++ lisp/ChangeLog 2011-05-13 01:38:31 +0000 @@ -2,6 +2,7 @@ * calendar/appt.el (appt-make-list): Simplify. (appt-time-msg-list): Doc fix. + (appt-check): Change mode-line message at the time of the appointment. 2011-05-12 Andreas Schwab === modified file 'lisp/calendar/appt.el' --- lisp/calendar/appt.el 2011-05-13 01:35:11 +0000 +++ lisp/calendar/appt.el 2011-05-13 01:38:31 +0000 @@ -342,7 +342,9 @@ (when appt-display-mode-line (setq appt-mode-string (concat " " (propertize - (format "App't in %s min." min-to-app) + (format "App't %s" + (if (zerop min-to-app) "NOW" + (format "in %s min." min-to-app))) 'face 'mode-line-emphasis)))) ;; When an appointment is reached, delete it from the ;; list. Reset the count to 0 in case we display another ------------------------------------------------------------ revno: 104210 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 18:35:11 -0700 message: * lisp/calendar/appt.el (appt-time-msg-list): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-13 01:31:53 +0000 +++ lisp/ChangeLog 2011-05-13 01:35:11 +0000 @@ -1,6 +1,7 @@ 2011-05-13 Glenn Morris * calendar/appt.el (appt-make-list): Simplify. + (appt-time-msg-list): Doc fix. 2011-05-12 Andreas Schwab === modified file 'lisp/calendar/appt.el' --- lisp/calendar/appt.el 2011-05-13 01:31:53 +0000 +++ lisp/calendar/appt.el 2011-05-13 01:35:11 +0000 @@ -167,16 +167,16 @@ ;; TODO Turn this into an alist? It would be easier to add more ;; optional elements. -;; TODO There should be a way to set WARNTIME (and other properties) -;; from the diary-file. Implementing that would be a good reason -;; to change this to an alist. +;; Why is the first element (MINUTES) rather than just MINUTES? +;; It may just inherit from diary-entries-list, where we have +;; ((MONTH DAY YEAR) ENTRY) (defvar appt-time-msg-list nil "The list of appointments for today. Use `appt-add' and `appt-delete' to add and delete appointments. The original list is generated from today's `diary-entries-list', and can be regenerated using the function `appt-check'. Each element of the generated list has the form -\(MINUTES STRING [FLAG] [WARNTIME]) +\((MINUTES) STRING [FLAG] [WARNTIME]) where MINUTES is the time in minutes of the appointment after midnight, and STRING is the description of the appointment. FLAG and WARNTIME are not always present. A non-nil FLAG @@ -548,6 +548,8 @@ ;; Get the whole string for this appointment. (appt-time-string (substring time-string beg end)) + ;; FIXME why the list? It makes the first + ;; element (MINUTES) rather than MINUTES. (appt-time (list (appt-convert-time only-time))) (time-msg (append (list appt-time appt-time-string) ------------------------------------------------------------ revno: 104209 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 18:31:53 -0700 message: * lisp/calendar/appt.el (appt-make-list): Simplify. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-12 16:46:53 +0000 +++ lisp/ChangeLog 2011-05-13 01:31:53 +0000 @@ -1,3 +1,7 @@ +2011-05-13 Glenn Morris + + * calendar/appt.el (appt-make-list): Simplify. + 2011-05-12 Andreas Schwab * progmodes/ld-script.el (ld-script-keywords) === modified file 'lisp/calendar/appt.el' --- lisp/calendar/appt.el 2011-05-12 07:56:02 +0000 +++ lisp/calendar/appt.el 2011-05-13 01:31:53 +0000 @@ -569,15 +569,12 @@ (setq entry-list (cdr entry-list))))) (setq appt-time-msg-list (appt-sort-list appt-time-msg-list)) ;; Convert current time to minutes after midnight (12:01am = 1), - ;; so that elements in the list that are earlier than the - ;; present time can be removed. + ;; and remove elements in the list that are in the past. (let* ((now (decode-time)) - (cur-comp-time (+ (* 60 (nth 2 now)) (nth 1 now))) - (appt-comp-time (caar (car appt-time-msg-list)))) - (while (and appt-time-msg-list (< appt-comp-time cur-comp-time)) - (setq appt-time-msg-list (cdr appt-time-msg-list)) - (if appt-time-msg-list - (setq appt-comp-time (caar (car appt-time-msg-list))))))))) + (now-mins (+ (* 60 (nth 2 now)) (nth 1 now)))) + (while (and appt-time-msg-list + (< (caar (car appt-time-msg-list)) now-mins)) + (setq appt-time-msg-list (cdr appt-time-msg-list))))))) (defun appt-sort-list (appt-list) ------------------------------------------------------------ revno: 104208 committer: Andreas Schwab branch nick: emacs timestamp: Thu 2011-05-12 18:46:53 +0200 message: * lisp/progmodes/ld-script.el (ld-script-keywords) (ld-script-builtins): Update keywords list. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-12 16:30:17 +0000 +++ lisp/ChangeLog 2011-05-12 16:46:53 +0000 @@ -1,3 +1,8 @@ +2011-05-12 Andreas Schwab + + * progmodes/ld-script.el (ld-script-keywords) + (ld-script-builtins): Update keywords list. + 2011-05-12 Stefan Monnier * progmodes/grep.el (grep-filter): Don't trip on partial lines. === modified file 'lisp/progmodes/ld-script.el' --- lisp/progmodes/ld-script.el 2011-01-25 04:08:28 +0000 +++ lisp/progmodes/ld-script.el 2011-05-12 16:46:53 +0000 @@ -80,9 +80,12 @@ "INCLUDE" "INPUT" "GROUP" "AS_NEEDED" "OUTPUT" "SEARCH_DIR" "STARTUP" ;; 3.4.3 Commands Dealing with Object File Formats "OUTPUT_FORMAT" "TARGET" - ;; 3.4.3 Other Linker Script Commands + ;; 3.4.4 Assign alias names to memory regions + "REGION_ALIAS" + ;; 3.4.5 Other Linker Script Commands "ASSERT" "EXTERN" "FORCE_COMMON_ALLOCATION" - "INHIBIT_COMMON_ALLOCATION" "NOCROSSREFS" "OUTPUT_ARCH" + "INHIBIT_COMMON_ALLOCATION" "INSERT" "AFTER" "BEFORE" + "NOCROSSREFS" "OUTPUT_ARCH" "LD_FEATURE" ;; 3.5.2 PROVIDE "PROVIDE" ;; 3.5.3 PROVIDE_HIDDEN @@ -90,7 +93,7 @@ ;; 3.6 SECTIONS Command "SECTIONS" ;; 3.6.4.2 Input Section Wildcard Patterns - "SORT" "SORT_BY_NAME" "SORT_BY_ALIGNMENT" + "SORT" "SORT_BY_NAME" "SORT_BY_ALIGNMENT" "SORT_BY_INIT_PRIORITY" ;; 3.6.4.3 Input Section for Common Symbols "COMMON" ;; 3.6.4.4 Input Section and Garbage Collection @@ -108,22 +111,30 @@ "AT" ;; 3.6.8.4 Forced Input Alignment "SUBALIGN" - ;; 3.6.8.6 Output Section Phdr + ;; 3.6.8.5 Output Section Constraint + "ONLY_IF_RO" "ONLY_IF_RW" + ;; 3.6.8.7 Output Section Phdr ":PHDR" ;; 3.7 MEMORY Command "MEMORY" ;; 3.8 PHDRS Command "PHDRS" "FILEHDR" "FLAGS" - "PT_NULL" "PT_LOAD" "PT_DYNAMIC" "PT_INTERP" "PT_NONE" "PT_SHLIB" "PT_PHDR" + "PT_NULL" "PT_LOAD" "PT_DYNAMIC" "PT_INTERP" "PT_NOTE" "PT_SHLIB" "PT_PHDR" ;; 3.9 VERSION Command "VERSION") "Keywords used of GNU ld script.") -;; 3.10.8 Builtin Functions + +;; 3.10.2 Symbolic Constants +;; 3.10.9 Builtin Functions (defvar ld-script-builtins - '("ABSOLUTE" + '("CONSTANT" + "MAXPAGESIZE" + "COMMONPAGESIZE" + "ABSOLUTE" "ADDR" "ALIGN" + "ALIGNOF" "BLOCK" "DATA_SEGMENT_ALIGN" "DATA_SEGMENT_END" @@ -149,7 +160,7 @@ 1 font-lock-builtin-face) ;; 3.6.7 Output Section Discarding ;; 3.6.4.1 Input Section Basics - ;; 3.6.8.6 Output Section Phdr + ;; 3.6.8.7 Output Section Phdr ("/DISCARD/\\|EXCLUDE_FILE\\|:NONE" . font-lock-warning-face) ("\\W\\(\\.\\)\\W" 1 ld-script-location-counter-face) ) ------------------------------------------------------------ revno: 104207 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 09:30:17 -0700 message: Put ChangeLog entries in the correct files. diff: === modified file 'ChangeLog' --- ChangeLog 2011-05-12 07:24:14 +0000 +++ ChangeLog 2011-05-12 16:30:17 +0000 @@ -3,37 +3,6 @@ * Makefile.in (src, install-arch-indep, bootstrap-clean) (check-declare): Shell portability fixes. (Bug#8642) -2011-05-10 Jim Meyering - - Fix doubled-word typos. - * admin/notes/exit-value: the the -> the - * doc/lispref/minibuf.texi: in in -> in - * doc/misc/ede.texi: or or -> or - * etc/MH-E-NEWS: the the -> the - * etc/PROBLEMS: Likewise. - * lisp/cedet/ede/pmake.el (ede-proj-makefile-garbage-patterns): Likewise. - * lisp/cedet/semantic/complete.el - (semantic-complete-read-tag-local-members): Likewise. - * lisp/cedet/ede.el (ede-auto-add-method): then then -> then - * lisp/gnus/shr.el (shr-colorize-region): on on -> on - * lisp/international/quail.el (quail-insert-kbd-layout): and and -> and - * lisp/kermit.el: and and -> and - * lisp/mh-e/mh-alias.el (mh-alias-minibuffer-confirm-address): - if if -> if it - * lisp/mh-e/mh-scan.el (mh-scan-destination-width): in in -> in - * lisp/net/ldap.el (ldap-search-internal): to to -> to - * lisp/org/org-agenda.el (org-agenda-entry-types): the the -> the - * lisp/org/org-table.el (org-table-get-remote-range): or or -> or - * lisp/org/org-wl.el (org-wl-folder-type): the the -> the - * lisp/org/org.el (org-goto, org-inside-LaTeX-fragment-p): Likewise. - * lisp/progmodes/vhdl-mode.el (vhdl-offsets-alist): Likewise. - * lisp/progmodes/js.el (js-mode): and and -> and - * lisp/textmodes/artist.el (artist-move-to-xy): at at -> at - (artist-draw-region-trim-line-endings): if if -> if - And Safetyc -> Safety. - * lisp/textmodes/reftex-dcr.el (reftex-view-crossref): at at -> at a - * src/xdisp.c (x_intersect_rectangles): the the -> the - 2011-05-09 Teodor Zlatanov * configure.in: Require GnuTLS 2.6.x or higher. === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-05-12 07:27:35 +0000 +++ doc/lispref/ChangeLog 2011-05-12 16:30:17 +0000 @@ -14,6 +14,10 @@ * modes.texi (Region to Fontify): Fix typo. +2011-05-10 Jim Meyering + + * minibuf.texi: Fix typo "in in -> in". + 2011-05-06 Paul Eggert * numbers.texi (Integer Basics): Large integers are treated as floats. === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-05-04 02:00:20 +0000 +++ doc/misc/ChangeLog 2011-05-12 16:30:17 +0000 @@ -1,3 +1,7 @@ +2011-05-10 Jim Meyering + + * ede.texi: Fix typo "or or -> or". + 2011-05-03 Peter Münster (tiny change) * gnus.texi (Summary Buffer Lines): === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-05-05 06:31:14 +0000 +++ etc/ChangeLog 2011-05-12 16:30:17 +0000 @@ -1,3 +1,7 @@ +2011-05-10 Jim Meyering + + * MH-E-NEWS, PROBLEMS: Fix typo "the the -> the". + 2011-05-03 Leo Liu * NEWS: Mention the new command isearch-yank-pop. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-12 15:10:17 +0000 +++ lisp/ChangeLog 2011-05-12 16:30:17 +0000 @@ -71,6 +71,19 @@ (footnote-style-alist): Add unicode style to the list. (footnote-style): Doc fix. +2011-05-10 Jim Meyering + + Fix doubled-word typos. + * international/quail.el (quail-insert-kbd-layout): and and -> and + * kermit.el: and and -> and + * net/ldap.el (ldap-search-internal): to to -> to + * progmodes/vhdl-mode.el (vhdl-offsets-alist): Likewise. + * progmodes/js.el (js-mode): and and -> and + * textmodes/artist.el (artist-move-to-xy): at at -> at + (artist-draw-region-trim-line-endings): if if -> if + And Safetyc -> Safety. + * textmodes/reftex-dcr.el (reftex-view-crossref): at at -> at a + 2011-05-10 Glenn Morris Stefan Monnier === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2011-05-11 16:35:54 +0000 +++ lisp/cedet/ChangeLog 2011-05-12 16:30:17 +0000 @@ -3,6 +3,14 @@ * semantic/wisent/javascript.el (semantic-get-local-variables): Use define-mode-local-override rather than its obsolete alias. +2011-05-10 Jim Meyering + + Fix doubled-word typos. + * ede/pmake.el (ede-proj-makefile-garbage-patterns): the the -> the + * semantic/complete.el (semantic-complete-read-tag-local-members): + Likewise. + * ede.el (ede-auto-add-method): then then -> then + 2011-04-23 Juanma Barranquero * ede/pconf.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf): === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-11 22:12:27 +0000 +++ lisp/gnus/ChangeLog 2011-05-12 16:30:17 +0000 @@ -8,6 +8,10 @@ (registry-prune-soft-candidates): Helper methods for registry pruning. (registry-prune): Use them. Make the sort function optional. +2011-05-10 Jim Meyering + + * shr.el (shr-colorize-region): Fix typo "on on -> on". + 2011-05-10 Julien Danjou * shr.el (shr-put-color-1): Do not bug out when old-props is a face === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2011-04-28 15:32:28 +0000 +++ lisp/mh-e/ChangeLog 2011-05-12 16:30:17 +0000 @@ -1,3 +1,9 @@ +2011-05-10 Jim Meyering + + Fix doubled-word typos. + * mh-alias.el (mh-alias-minibuffer-confirm-address): if if -> if it + * mh-scan.el (mh-scan-destination-width): in in -> in + 2011-04-28 Stefan Monnier * mh-utils.el (mh-folder-completion-function): Make it work like === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-04-06 12:18:10 +0000 +++ lisp/org/ChangeLog 2011-05-12 16:30:17 +0000 @@ -1,3 +1,11 @@ +2011-05-10 Jim Meyering + + Fix doubled-word typos. + * org-agenda.el (org-agenda-entry-types): the the -> the + * org-table.el (org-table-get-remote-range): or or -> or + * org-wl.el (org-wl-folder-type): the the -> the + * org.el (org-goto, org-inside-LaTeX-fragment-p): Likewise. + 2011-03-15 Stefan Monnier * org-src.el (org-src-switch-to-buffer): === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-12 07:07:06 +0000 +++ src/ChangeLog 2011-05-12 16:30:17 +0000 @@ -14,6 +14,10 @@ (x_scroll_run) [USE_TOOLKIT_SCROLL_BARS]: Take account of fringe background extension. +2011-05-10 Jim Meyering + + * xdisp.c (x_intersect_rectangles): Fix typo "the the -> the". + 2011-05-10 Juanma Barranquero * image.c (Finit_image_library): Return t for built-in image types, ------------------------------------------------------------ revno: 104206 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2011-05-12 12:10:17 -0300 message: * lisp/progmodes/grep.el (grep-filter): Don't trip on partial lines. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-12 12:55:10 +0000 +++ lisp/ChangeLog 2011-05-12 15:10:17 +0000 @@ -1,5 +1,7 @@ 2011-05-12 Stefan Monnier + * progmodes/grep.el (grep-filter): Don't trip on partial lines. + * shell.el (shell-completion-vars): New function. (shell-mode): * simple.el (read-shell-command): Use it. === modified file 'lisp/progmodes/grep.el' --- lisp/progmodes/grep.el 2011-05-08 05:17:17 +0000 +++ lisp/progmodes/grep.el 2011-05-12 15:10:17 +0000 @@ -476,17 +476,23 @@ "Handle match highlighting escape sequences inserted by the grep process. This function is called from `compilation-filter-hook'." (save-excursion - (let ((end (point-marker))) - ;; Highlight grep matches and delete marking sequences. - (goto-char compilation-filter-start) - (while (re-search-forward "\033\\[01;31m\\(.*?\\)\033\\[[0-9]*m" end 1) - (replace-match (propertize (match-string 1) - 'face nil 'font-lock-face grep-match-face) - t t)) - ;; Delete all remaining escape sequences - (goto-char compilation-filter-start) - (while (re-search-forward "\033\\[[0-9;]*[mK]" end 1) - (replace-match "" t t))))) + (forward-line 0) + (let ((end (point))) + (goto-char compilation-filter-start) + (forward-line 0) + ;; Only operate on whole lines so we don't get caught with part of an + ;; escape sequence in one chunk and the rest in another. + (when (< (point) end) + (setq end (copy-marker end)) + ;; Highlight grep matches and delete marking sequences. + (while (re-search-forward "\033\\[01;31m\\(.*?\\)\033\\[[0-9]*m" end 1) + (replace-match (propertize (match-string 1) + 'face nil 'font-lock-face grep-match-face) + t t)) + ;; Delete all remaining escape sequences + (goto-char compilation-filter-start) + (while (re-search-forward "\033\\[[0-9;]*[mK]" end 1) + (replace-match "" t t)))))) (defun grep-probe (command args &optional func result) (let (process-file-side-effects) ------------------------------------------------------------ revno: 104205 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2011-05-12 09:55:10 -0300 message: * lisp/shell.el (shell-completion-vars): New function. (shell-mode): * lisp/simple.el (read-shell-command): Use it. (blink-matching-open): No need for " [...]" in minibuffer-message. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-12 07:56:02 +0000 +++ lisp/ChangeLog 2011-05-12 12:55:10 +0000 @@ -1,3 +1,10 @@ +2011-05-12 Stefan Monnier + + * shell.el (shell-completion-vars): New function. + (shell-mode): + * simple.el (read-shell-command): Use it. + (blink-matching-open): No need for " [...]" in minibuffer-message. + 2011-05-12 Glenn Morris * calendar/appt.el (appt-now-displayed): Remove pointless variable. === modified file 'lisp/shell.el' --- lisp/shell.el 2011-04-20 22:31:06 +0000 +++ lisp/shell.el 2011-05-12 12:55:10 +0000 @@ -380,6 +380,25 @@ :group 'shell :type '(choice (const nil) regexp)) +(defun shell-completion-vars () + "Setup completion vars for `shell-mode' and `read-shell-command'." + (set (make-local-variable 'comint-completion-fignore) + shell-completion-fignore) + (set (make-local-variable 'comint-delimiter-argument-list) + shell-delimiter-argument-list) + (set (make-local-variable 'comint-file-name-chars) shell-file-name-chars) + (set (make-local-variable 'comint-file-name-quote-list) + shell-file-name-quote-list) + (set (make-local-variable 'comint-dynamic-complete-functions) + shell-dynamic-complete-functions) + (set (make-local-variable 'pcomplete-parse-arguments-function) + ;; FIXME: This function should be moved to shell.el. + #'pcomplete-parse-comint-arguments) + (setq comint-input-autoexpand shell-input-autoexpand) + ;; Not needed in shell-mode because it's inherited from comint-mode, but + ;; placed here for read-shell-command. + (add-hook 'completion-at-point-functions 'comint-completion-at-point nil t)) + (put 'shell-mode 'mode-class 'special) (define-derived-mode shell-mode comint-mode "Shell" @@ -437,22 +456,12 @@ control whether input and output cause the window to scroll to the end of the buffer." (setq comint-prompt-regexp shell-prompt-pattern) - (setq comint-completion-fignore shell-completion-fignore) - (setq comint-delimiter-argument-list shell-delimiter-argument-list) - (setq comint-file-name-chars shell-file-name-chars) - (setq comint-file-name-quote-list shell-file-name-quote-list) - (set (make-local-variable 'comint-dynamic-complete-functions) - shell-dynamic-complete-functions) + (shell-completion-vars) (set (make-local-variable 'paragraph-separate) "\\'") - (make-local-variable 'paragraph-start) - (setq paragraph-start comint-prompt-regexp) - (make-local-variable 'font-lock-defaults) - (setq font-lock-defaults '(shell-font-lock-keywords t)) - (make-local-variable 'shell-dirstack) - (setq shell-dirstack nil) - (make-local-variable 'shell-last-dir) - (setq shell-last-dir nil) - (setq comint-input-autoexpand shell-input-autoexpand) + (set (make-local-variable 'paragraph-start) comint-prompt-regexp) + (set (make-local-variable 'font-lock-defaults) '(shell-font-lock-keywords t)) + (set (make-local-variable 'shell-dirstack) nil) + (set (make-local-variable 'shell-last-dir) nil) (shell-dirtrack-mode 1) ;; This is not really correct, since the shell buffer does not really ;; edit this directory. But it is useful in the buffer list and menus. === modified file 'lisp/simple.el' --- lisp/simple.el 2011-05-06 01:02:49 +0000 +++ lisp/simple.el 2011-05-12 12:55:10 +0000 @@ -36,10 +36,6 @@ ;;; From compile.el (defvar compilation-current-error) (defvar compilation-context-lines) -;;; From comint.el -(defvar comint-file-name-quote-list) -(defvar comint-file-name-chars) -(defvar comint-delimiter-argument-list) (defcustom idle-update-delay 0.5 "Idle time delay before updating various things on the screen. @@ -2167,12 +2163,7 @@ (append minibuffer-default commands) (cons minibuffer-default commands)))) -(defvar shell-delimiter-argument-list) -(defvar shell-file-name-chars) -(defvar shell-file-name-quote-list) -(defvar shell-dynamic-complete-functions) -;; shell requires comint. -(defvar comint-dynamic-complete-functions) +(declare-function shell-completion-vars "shell" ()) (defvar minibuffer-local-shell-command-map (let ((map (make-sparse-keymap))) @@ -2189,15 +2180,7 @@ (require 'shell) (minibuffer-with-setup-hook (lambda () - (set (make-local-variable 'comint-delimiter-argument-list) - shell-delimiter-argument-list) - (set (make-local-variable 'comint-file-name-chars) shell-file-name-chars) - (set (make-local-variable 'comint-file-name-quote-list) - shell-file-name-quote-list) - (set (make-local-variable 'comint-dynamic-complete-functions) - shell-dynamic-complete-functions) - (add-hook 'completion-at-point-functions - 'comint-completion-at-point nil 'local) + (shell-completion-vars) (set (make-local-variable 'minibuffer-default-add-function) 'minibuffer-default-add-shell-commands)) (apply 'read-from-minibuffer prompt initial-contents @@ -5589,10 +5572,10 @@ (mismatch (if blinkpos (if (minibufferp) - (minibuffer-message " [Mismatched parentheses]") + (minibuffer-message "Mismatched parentheses") (message "Mismatched parentheses")) (if (minibufferp) - (minibuffer-message " [Unmatched parenthesis]") + (minibuffer-message "Unmatched parenthesis") (message "Unmatched parenthesis")))) ((not blinkpos) nil) ((pos-visible-in-window-p blinkpos) ------------------------------------------------------------ revno: 104204 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 00:56:02 -0700 message: appt.el code simplifications. * lisp/calendar/appt.el (appt-now-displayed): Remove pointless variable. (appt-check): Simplify. Details: appt-now-displayed was set non-nil the first time a reminder was displayed. Nothing ever set it back to nil again. Thus when full-check was nil, mode-line-only was always true, so the "(when (or full-check mode-line-only)" was pointless. That was the only use of full-check. mode-line-only was only used in a negative sense, and can be reduced to the zerop test. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-12 07:07:06 +0000 +++ lisp/ChangeLog 2011-05-12 07:56:02 +0000 @@ -1,3 +1,8 @@ +2011-05-12 Glenn Morris + + * calendar/appt.el (appt-now-displayed): Remove pointless variable. + (appt-check): Simplify. + 2011-05-12 Eli Zaretskii * smerge-mode.el (smerge-resolve): Use null-device rather than a === modified file 'lisp/calendar/appt.el' --- lisp/calendar/appt.el 2011-05-07 01:19:27 +0000 +++ lisp/calendar/appt.el 2011-05-12 07:56:02 +0000 @@ -197,9 +197,6 @@ "Time of day (mins since midnight) at which we last checked appointments. A nil value forces the diary file to be (re-)checked for appointments.") -(defvar appt-now-displayed nil - "Non-nil when we have started notifying about a appointment that is near.") - (defvar appt-display-count nil "Internal variable used to count number of consecutive reminders.") @@ -285,93 +282,83 @@ (let* ((min-to-app -1) (prev-appt-mode-string appt-mode-string) (prev-appt-display-count (or appt-display-count 0)) - ;; Non-nil means do a full check for pending appointments and - ;; display in whatever ways the user has selected. When no - ;; appointment is being displayed, we always do a full check. - (full-check - (or (not appt-now-displayed) - ;; This is true every appt-display-interval minutes. - (zerop (mod prev-appt-display-count appt-display-interval)))) - ;; Non-nil means only update the interval displayed in the mode line. - (mode-line-only (unless full-check appt-now-displayed)) now cur-comp-time appt-comp-time appt-warn-time) - (when (or full-check mode-line-only) - (save-excursion ; FIXME ? - ;; Convert current time to minutes after midnight (12.01am = 1). - (setq now (decode-time) - cur-comp-time (+ (* 60 (nth 2 now)) (nth 1 now))) - ;; At first check in any day, update appointments to today's list. - (if (or force ; eg initialize, diary save - (null appt-prev-comp-time) ; first check - (< cur-comp-time appt-prev-comp-time)) ; new day - (ignore-errors - (let ((diary-hook (if (assoc 'appt-make-list diary-hook) - diary-hook - (cons 'appt-make-list diary-hook)))) - (if appt-display-diary - (diary) - ;; Not displaying the diary, so we can ignore - ;; diary-number-of-entries. Since appt.el only - ;; works on a daily basis, no need for more entries. - (diary-list-entries (calendar-current-date) 1 t))))) - (setq appt-prev-comp-time cur-comp-time - appt-mode-string nil - appt-display-count nil) - ;; If there are entries in the list, and the user wants a - ;; message issued, get the first time off of the list and - ;; calculate the number of minutes until the appointment. - (when appt-time-msg-list - (setq appt-comp-time (caar (car appt-time-msg-list)) - appt-warn-time (or (nth 3 (car appt-time-msg-list)) - appt-message-warning-time) - min-to-app (- appt-comp-time cur-comp-time)) - (while (and appt-time-msg-list - (< appt-comp-time cur-comp-time)) - (setq appt-time-msg-list (cdr appt-time-msg-list)) - (if appt-time-msg-list - (setq appt-comp-time (caar (car appt-time-msg-list))))) - ;; If we have an appointment between midnight and - ;; `appt-warn-time' minutes after midnight, we - ;; must begin to issue a message before midnight. Midnight - ;; is considered 0 minutes and 11:59pm is 1439 - ;; minutes. Therefore we must recalculate the minutes to - ;; appointment variable. It is equal to the number of - ;; minutes before midnight plus the number of minutes after - ;; midnight our appointment is. - (if (and (< appt-comp-time appt-warn-time) - (> (+ cur-comp-time appt-warn-time) - appt-max-time)) - (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time) - appt-comp-time))) - ;; Issue warning if the appointment time is within - ;; appt-message-warning time. - (when (and (<= min-to-app appt-warn-time) - (>= min-to-app 0)) - (setq appt-now-displayed t - appt-display-count (1+ prev-appt-display-count)) - (unless mode-line-only - (appt-display-message (cadr (car appt-time-msg-list)) - min-to-app)) - (when appt-display-mode-line - (setq appt-mode-string - (concat " " (propertize - (format "App't in %s min." min-to-app) - 'face 'mode-line-emphasis)))) - ;; When an appointment is reached, delete it from the - ;; list. Reset the count to 0 in case we display another - ;; appointment on the next cycle. - (if (zerop min-to-app) - (setq appt-time-msg-list (cdr appt-time-msg-list) - appt-display-count nil)))) - ;; If we have changed the mode line string, redisplay all mode lines. - (and appt-display-mode-line - (not (string-equal appt-mode-string - prev-appt-mode-string)) - (progn - (force-mode-line-update t) - ;; If the string now has a notification, redisplay right now. - (if appt-mode-string - (sit-for 0)))))))) + (save-excursion ; FIXME ? + ;; Convert current time to minutes after midnight (12.01am = 1). + (setq now (decode-time) + cur-comp-time (+ (* 60 (nth 2 now)) (nth 1 now))) + ;; At first check in any day, update appointments to today's list. + (if (or force ; eg initialize, diary save + (null appt-prev-comp-time) ; first check + (< cur-comp-time appt-prev-comp-time)) ; new day + (ignore-errors + (let ((diary-hook (if (assoc 'appt-make-list diary-hook) + diary-hook + (cons 'appt-make-list diary-hook)))) + (if appt-display-diary + (diary) + ;; Not displaying the diary, so we can ignore + ;; diary-number-of-entries. Since appt.el only + ;; works on a daily basis, no need for more entries. + (diary-list-entries (calendar-current-date) 1 t))))) + (setq appt-prev-comp-time cur-comp-time + appt-mode-string nil + appt-display-count nil) + ;; If there are entries in the list, and the user wants a + ;; message issued, get the first time off of the list and + ;; calculate the number of minutes until the appointment. + (when appt-time-msg-list + (setq appt-comp-time (caar (car appt-time-msg-list)) + appt-warn-time (or (nth 3 (car appt-time-msg-list)) + appt-message-warning-time) + min-to-app (- appt-comp-time cur-comp-time)) + (while (and appt-time-msg-list + (< appt-comp-time cur-comp-time)) + (setq appt-time-msg-list (cdr appt-time-msg-list)) + (if appt-time-msg-list + (setq appt-comp-time (caar (car appt-time-msg-list))))) + ;; If we have an appointment between midnight and + ;; `appt-warn-time' minutes after midnight, we + ;; must begin to issue a message before midnight. Midnight + ;; is considered 0 minutes and 11:59pm is 1439 + ;; minutes. Therefore we must recalculate the minutes to + ;; appointment variable. It is equal to the number of + ;; minutes before midnight plus the number of minutes after + ;; midnight our appointment is. + (if (and (< appt-comp-time appt-warn-time) + (> (+ cur-comp-time appt-warn-time) + appt-max-time)) + (setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time) + appt-comp-time))) + ;; Issue warning if the appointment time is within + ;; appt-message-warning time. + (when (and (<= min-to-app appt-warn-time) + (>= min-to-app 0)) + (setq appt-display-count (1+ prev-appt-display-count)) + ;; This is true every appt-display-interval minutes. + (and (zerop (mod prev-appt-display-count appt-display-interval)) + (appt-display-message (cadr (car appt-time-msg-list)) + min-to-app)) + (when appt-display-mode-line + (setq appt-mode-string + (concat " " (propertize + (format "App't in %s min." min-to-app) + 'face 'mode-line-emphasis)))) + ;; When an appointment is reached, delete it from the + ;; list. Reset the count to 0 in case we display another + ;; appointment on the next cycle. + (if (zerop min-to-app) + (setq appt-time-msg-list (cdr appt-time-msg-list) + appt-display-count nil)))) + ;; If we have changed the mode line string, redisplay all mode lines. + (and appt-display-mode-line + (not (string-equal appt-mode-string + prev-appt-mode-string)) + (progn + (force-mode-line-update t) + ;; If the string now has a notification, redisplay right now. + (if appt-mode-string + (sit-for 0))))))) (defun appt-disp-window (min-to-app new-time appt-msg) "Display appointment due in MIN-TO-APP (a string) minutes. ------------------------------------------------------------ revno: 104203 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 00:27:35 -0700 message: * doc/lispref/display.texi (Image Descriptors): Fix typo. (Bug#8495) diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-05-12 07:07:06 +0000 +++ doc/lispref/ChangeLog 2011-05-12 07:27:35 +0000 @@ -1,3 +1,7 @@ +2011-05-12 Glenn Morris + + * display.texi (Image Descriptors): Fix typo. (Bug#8495) + 2011-05-12 Stefan Monnier * modes.texi (Region to Refontify): Rename from "Region to Fontify". === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-01-31 23:54:50 +0000 +++ doc/lispref/display.texi 2011-05-12 07:27:35 +0000 @@ -4213,14 +4213,14 @@ @tex $$\pmatrix{1 & 0 & 0 \cr 0& 0 & 0 \cr - 9 & 9 & -1 \cr}$$ + 0 & 0 & -1 \cr}$$ @end tex @end iftex @ifnottex @display (1 0 0 0 0 0 - 9 9 -1) + 0 0 -1) @end display @end ifnottex ------------------------------------------------------------ revno: 104202 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 00:24:14 -0700 message: Small Makefile.in fixes for bug#8642. * Makefile.in (src, install-arch-indep, bootstrap-clean, check-declare): Shell portability fixes. diff: === modified file 'ChangeLog' --- ChangeLog 2011-05-10 13:57:12 +0000 +++ ChangeLog 2011-05-12 07:24:14 +0000 @@ -1,6 +1,11 @@ +2011-05-12 Glenn Morris + + * Makefile.in (src, install-arch-indep, bootstrap-clean) + (check-declare): Shell portability fixes. (Bug#8642) + 2011-05-10 Jim Meyering - fix doubled-word typos + Fix doubled-word typos. * admin/notes/exit-value: the the -> the * doc/lispref/minibuf.texi: in in -> in * doc/misc/ede.texi: or or -> or === modified file 'Makefile.in' --- Makefile.in 2011-05-06 06:30:56 +0000 +++ Makefile.in 2011-05-12 07:24:14 +0000 @@ -373,7 +373,7 @@ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"; \ fi; if [ -r .bzr/checkout/dirstate ]; then \ - vcswitness="$$(pwd)/.bzr/checkout/dirstate"; \ + vcswitness="`pwd`/.bzr/checkout/dirstate"; \ fi; \ cd $@; $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ @@ -623,7 +623,7 @@ fi; \ cd ${srcdir}/info ; \ for elt in $(INFO_FILES); do \ - test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \ + test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ chmod a+r $(DESTDIR)${infodir}/$$f; \ @@ -639,7 +639,7 @@ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ then \ for elt in $(INFO_FILES); do \ - test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \ + test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ (cd $${thisdir}; \ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ done; \ @@ -829,7 +829,7 @@ -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean) (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) - [ ! -e config.log ] || mv -f config.log config.log~ + [ ! -f config.log ] || mv -f config.log config.log~ ${top_bootclean} ## configure; make bootstrap replaces the real config.log from configure ## with the truncated one from config.status. The former is more useful. @@ -944,7 +944,7 @@ .PHONY: check-declare check-declare: - @if [ ! -e $(srcdir)/src/emacs ]; then \ + @if [ ! -f $(srcdir)/src/emacs ]; then \ echo "You must build Emacs to use this command"; \ exit 1; \ fi ------------------------------------------------------------ revno: 104201 [merge] committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-12 00:07:06 -0700 message: Merge from emacs-23; up to r100577. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-05-06 07:13:19 +0000 +++ doc/lispref/ChangeLog 2011-05-12 07:07:06 +0000 @@ -1,3 +1,15 @@ +2011-05-12 Stefan Monnier + + * modes.texi (Region to Refontify): Rename from "Region to Fontify". + (Multiline Font Lock): + * vol2.texi (Top): + * vol1.texi (Top): + * elisp.texi (Top): Update menu accordingly. + +2011-05-12 Drew Adams + + * modes.texi (Region to Fontify): Fix typo. + 2011-05-06 Paul Eggert * numbers.texi (Integer Basics): Large integers are treated as floats. === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2011-03-21 16:42:16 +0000 +++ doc/lispref/elisp.texi 2011-05-12 07:07:06 +0000 @@ -828,7 +828,7 @@ Multiline Font Lock Constructs * Font Lock Multiline:: Marking multiline chunks with a text property. -* Region to Fontify:: Controlling which region gets refontified +* Region to Refontify:: Controlling which region gets refontified after a buffer change. Documentation === modified file 'doc/lispref/files.texi' --- doc/lispref/files.texi 2011-03-03 08:10:52 +0000 +++ doc/lispref/files.texi 2011-05-12 07:07:06 +0000 @@ -251,7 +251,7 @@ @code{find-file-literally} sets this variable's local value, but other equivalent functions and commands can do that as well, e.g.@: to avoid automatic addition of a newline at the end of the file. This variable -us permanent local, so it is unaffected by changes of major modes. +is permanent local, so it is unaffected by changes of major modes. @end defvar @node Subroutines of Visiting === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2011-03-10 05:48:33 +0000 +++ doc/lispref/modes.texi 2011-05-12 07:07:06 +0000 @@ -3174,7 +3174,7 @@ @menu * Font Lock Multiline:: Marking multiline chunks with a text property. -* Region to Fontify:: Controlling which region gets refontified +* Region to Refontify:: Controlling which region gets refontified after a buffer change. @end menu @@ -3226,7 +3226,7 @@ Font-Lock looks at it, or use @code{font-lock-fontify-region-function}. -@node Region to Fontify +@node Region to Refontify @subsubsection Region to Fontify after a Buffer Change When a buffer is changed, the region that Font Lock refontifies is @@ -3235,15 +3235,15 @@ example, when a change alters the syntactic meaning of text on an earlier line. - You can enlarge (or even reduce) the region to fontify by setting -one the following variables: + You can enlarge (or even reduce) the region to refontify by setting +the following variable: @defvar font-lock-extend-after-change-region-function This buffer-local variable is either @code{nil} or a function for Font-Lock to call to determine the region to scan and fontify. The function is given three parameters, the standard @var{beg}, -@var{end}, and @var{old-len} from after-change-functions +@var{end}, and @var{old-len} from @code{after-change-functions} (@pxref{Change Hooks}). It should return either a cons of the beginning and end buffer positions (in that order) of the region to fontify, or @code{nil} (which means choose the region in the standard === modified file 'doc/lispref/vol1.texi' --- doc/lispref/vol1.texi 2011-03-21 16:42:16 +0000 +++ doc/lispref/vol1.texi 2011-05-12 07:07:06 +0000 @@ -847,7 +847,7 @@ Multiline Font Lock Constructs * Font Lock Multiline:: Marking multiline chunks with a text property. -* Region to Fontify:: Controlling which region gets refontified +* Region to Refontify:: Controlling which region gets refontified after a buffer change. Documentation === modified file 'doc/lispref/vol2.texi' --- doc/lispref/vol2.texi 2011-03-21 16:42:16 +0000 +++ doc/lispref/vol2.texi 2011-05-12 07:07:06 +0000 @@ -846,7 +846,7 @@ Multiline Font Lock Constructs * Font Lock Multiline:: Marking multiline chunks with a text property. -* Region to Fontify:: Controlling which region gets refontified +* Region to Refontify:: Controlling which region gets refontified after a buffer change. Documentation === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-12 02:36:05 +0000 +++ lisp/ChangeLog 2011-05-12 07:07:06 +0000 @@ -1,3 +1,19 @@ +2011-05-12 Eli Zaretskii + + * smerge-mode.el (smerge-resolve): Use null-device rather than a + literal "/dev/null". + +2011-05-12 Stefan Monnier + + * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point): + Fix typo. + +2011-05-12 Ralph Schleicher + + * progmodes/which-func.el (which-function): + Use add-log-current-defun instead of add-log-current-defun-function, + which might not be defined (Bug#8260). + 2011-05-12 Glenn Morris * emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble): === modified file 'lisp/emacs-lisp/lisp.el' --- lisp/emacs-lisp/lisp.el 2011-01-25 04:08:28 +0000 +++ lisp/emacs-lisp/lisp.el 2011-05-12 07:07:06 +0000 @@ -636,8 +636,8 @@ (plist (nthcdr 3 data))) (if (null data) (minibuffer-message "Nothing to complete") - (let ((completion-annotate-function - (plist-get plist :annotate-function))) + (let ((completion-annotate-function + (plist-get plist :annotation-function))) (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) (plist-get plist :predicate)))))) @@ -685,7 +685,7 @@ (when end (list beg end obarray :predicate predicate - :annotate-function + :annotation-function (unless (eq predicate 'fboundp) (lambda (str) (if (fboundp (intern-soft str)) " ")))))))) === modified file 'lisp/progmodes/which-func.el' --- lisp/progmodes/which-func.el 2011-01-25 04:08:28 +0000 +++ lisp/progmodes/which-func.el 2011-05-12 07:07:06 +0000 @@ -270,7 +270,7 @@ (defun which-function () "Return current function name based on point. Uses `which-func-functions', `imenu--index-alist' -or `add-log-current-defun-function'. +or `add-log-current-defun'. If no function name is found, return nil." (let ((name ;; Try the `which-func-functions' functions first. @@ -320,9 +320,8 @@ (reverse (cons (car pair) namestack)))))))))))) ;; Try using add-log support. - (when (and (null name) (boundp 'add-log-current-defun-function) - add-log-current-defun-function) - (setq name (funcall add-log-current-defun-function))) + (when (null name) + (setq name (add-log-current-defun))) ;; Filter the name if requested. (when name (if which-func-cleanup-function === modified file 'lisp/vc/smerge-mode.el' --- lisp/vc/smerge-mode.el 2011-03-11 20:04:22 +0000 +++ lisp/vc/smerge-mode.el 2011-05-12 07:07:06 +0000 @@ -566,7 +566,7 @@ (with-current-buffer buf (zerop (call-process-region (point-min) (point-max) "patch" t nil nil - "-r" "/dev/null" "--no-backup-if-mismatch" + "-r" null-device "--no-backup-if-mismatch" "-fl" o)))) (save-restriction (narrow-to-region m0b m0e) @@ -582,7 +582,7 @@ (with-current-buffer buf (zerop (call-process-region (point-min) (point-max) "patch" t nil nil - "-r" "/dev/null" "--no-backup-if-mismatch" + "-r" null-device "--no-backup-if-mismatch" "-fl" m)))) (save-restriction (narrow-to-region m0b m0e) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-10 10:31:33 +0000 +++ src/ChangeLog 2011-05-12 07:07:06 +0000 @@ -1,3 +1,19 @@ +2011-05-12 Drew Adams + + * textprop.c (Fprevious_single_char_property_change): Doc fix (bug#8655). + +2011-05-12 YAMAMOTO Mitsuharu + + * w32term.c (w32_draw_fringe_bitmap): Rename local vars `left' and + `width' to `bar_area_x' and `bar_area_width', respectively. + (x_scroll_run): Take account of fringe background extension. + + * xterm.c (x_draw_fringe_bitmap) [USE_TOOLKIT_SCROLL_BARS]: Rename + local vars `left' and `width' to `bar_area_x' and + `bar_area_width', respectively. + (x_scroll_run) [USE_TOOLKIT_SCROLL_BARS]: Take account of fringe + background extension. + 2011-05-10 Juanma Barranquero * image.c (Finit_image_library): Return t for built-in image types, === modified file 'src/textprop.c' --- src/textprop.c 2011-04-26 06:17:52 +0000 +++ src/textprop.c 2011-05-12 07:07:06 +0000 @@ -838,8 +838,8 @@ The property values are compared with `eq'. If the property is constant all the way to the start of OBJECT, return the first valid position in OBJECT. -If the optional fourth argument LIMIT is non-nil, don't search -back past position LIMIT; return LIMIT if nothing is found before LIMIT. */) +If the optional fourth argument LIMIT is non-nil, don't search back past +position LIMIT; return LIMIT if nothing is found before reaching LIMIT. */) (Lisp_Object position, Lisp_Object prop, Lisp_Object object, Lisp_Object limit) { if (STRINGP (object)) === modified file 'src/w32term.c' --- src/w32term.c 2011-03-25 15:39:59 +0000 +++ src/w32term.c 2011-05-12 07:07:06 +0000 @@ -715,22 +715,22 @@ if (sb_width > 0) { - int left = WINDOW_SCROLL_BAR_AREA_X (w); - int width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w) - * FRAME_COLUMN_WIDTH (f)); + int bar_area_x = WINDOW_SCROLL_BAR_AREA_X (w); + int bar_area_width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w) + * FRAME_COLUMN_WIDTH (f)); if (bx < 0) { /* Bitmap fills the fringe. */ - if (left + width == p->x) - bx = left + sb_width; - else if (p->x + p->wd == left) - bx = left; + if (bar_area_x + bar_area_width == p->x) + bx = bar_area_x + sb_width; + else if (p->x + p->wd == bar_area_x) + bx = bar_area_x; if (bx >= 0) { int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w); - nx = width - sb_width; + nx = bar_area_width - sb_width; by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, row->y)); ny = row->visible_height; @@ -738,13 +738,13 @@ } else { - if (left + width == bx) + if (bar_area_x + bar_area_width == bx) { - bx = left + sb_width; - nx += width - sb_width; + bx = bar_area_x + sb_width; + nx += bar_area_width - sb_width; } - else if (bx + nx == left) - nx += width - sb_width; + else if (bx + nx == bar_area_x) + nx += bar_area_width - sb_width; } } } @@ -2619,6 +2619,32 @@ fringes of W. */ window_box (w, -1, &x, &y, &width, &height); + /* If the fringe is adjacent to the left (right) scroll bar of a + leftmost (rightmost, respectively) window, then extend its + background to the gap between the fringe and the bar. */ + if ((WINDOW_LEFTMOST_P (w) + && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)) + || (WINDOW_RIGHTMOST_P (w) + && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))) + { + int sb_width = WINDOW_CONFIG_SCROLL_BAR_WIDTH (w); + + if (sb_width > 0) + { + int bar_area_x = WINDOW_SCROLL_BAR_AREA_X (w); + int bar_area_width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w) + * FRAME_COLUMN_WIDTH (f)); + + if (bar_area_x + bar_area_width == x) + { + x = bar_area_x + sb_width; + width += bar_area_width - sb_width; + } + else if (x + width == bar_area_x) + width += bar_area_width - sb_width; + } + } + from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y); to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y); bottom_y = y + height; === modified file 'src/xterm.c' --- src/xterm.c 2011-05-03 15:54:54 +0000 +++ src/xterm.c 2011-05-12 07:07:06 +0000 @@ -753,22 +753,22 @@ if (sb_width > 0) { - int left = WINDOW_SCROLL_BAR_AREA_X (w); - int width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w) - * FRAME_COLUMN_WIDTH (f)); + int bar_area_x = WINDOW_SCROLL_BAR_AREA_X (w); + int bar_area_width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w) + * FRAME_COLUMN_WIDTH (f)); if (bx < 0) { /* Bitmap fills the fringe. */ - if (left + width == p->x) - bx = left + sb_width; - else if (p->x + p->wd == left) - bx = left; + if (bar_area_x + bar_area_width == p->x) + bx = bar_area_x + sb_width; + else if (p->x + p->wd == bar_area_x) + bx = bar_area_x; if (bx >= 0) { int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w); - nx = width - sb_width; + nx = bar_area_width - sb_width; by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, row->y)); ny = row->visible_height; @@ -776,13 +776,13 @@ } else { - if (left + width == bx) + if (bar_area_x + bar_area_width == bx) { - bx = left + sb_width; - nx += width - sb_width; + bx = bar_area_x + sb_width; + nx += bar_area_width - sb_width; } - else if (bx + nx == left) - nx += width - sb_width; + else if (bx + nx == bar_area_x) + nx += bar_area_width - sb_width; } } } @@ -3232,6 +3232,34 @@ fringe of W. */ window_box (w, -1, &x, &y, &width, &height); +#ifdef USE_TOOLKIT_SCROLL_BARS + /* If the fringe is adjacent to the left (right) scroll bar of a + leftmost (rightmost, respectively) window, then extend its + background to the gap between the fringe and the bar. */ + if ((WINDOW_LEFTMOST_P (w) + && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)) + || (WINDOW_RIGHTMOST_P (w) + && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))) + { + int sb_width = WINDOW_CONFIG_SCROLL_BAR_WIDTH (w); + + if (sb_width > 0) + { + int bar_area_x = WINDOW_SCROLL_BAR_AREA_X (w); + int bar_area_width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w) + * FRAME_COLUMN_WIDTH (f)); + + if (bar_area_x + bar_area_width == x) + { + x = bar_area_x + sb_width; + width += bar_area_width - sb_width; + } + else if (x + width == bar_area_x) + width += bar_area_width - sb_width; + } + } +#endif + from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y); to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y); bottom_y = y + height; ------------------------------------------------------------ revno: 104200 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-05-11 19:36:05 -0700 message: bytecomp.el fix for bug#8647 * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble): Let byte-compile-initial-macro-environment always take precedence. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-12 02:25:58 +0000 +++ lisp/ChangeLog 2011-05-12 02:36:05 +0000 @@ -1,3 +1,8 @@ +2011-05-12 Glenn Morris + + * emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble): + Let byte-compile-initial-macro-environment always take precedence. + 2011-05-12 Stefan Monnier * net/rcirc.el: Add support for SSL/TLS connections. === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2011-05-11 17:32:38 +0000 +++ lisp/emacs-lisp/bytecomp.el 2011-05-12 02:36:05 +0000 @@ -2421,7 +2421,11 @@ (let* ((code (byte-compile-lambda (nthcdr 2 form) t))) (if this-one - (setcdr this-one code) + ;; A definition in b-c-initial-m-e should always take precedence + ;; during compilation, so don't let it be redefined. (Bug#8647) + (or (and macrop + (assq name byte-compile-initial-macro-environment)) + (setcdr this-one code)) (set this-kind (cons (cons name code) (symbol-value this-kind)))) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.