Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103510. ------------------------------------------------------------ revno: 103510 committer: Jay Belanger branch nick: trunk timestamp: Fri 2011-03-04 00:35:49 -0600 message: * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted variables as units. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-04 05:16:56 +0000 +++ lisp/ChangeLog 2011-03-04 06:35:49 +0000 @@ -1,3 +1,8 @@ +2011-03-04 Jay Belanger + + * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted + variables as units. + 2011-03-04 Bob Rogers * emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error === modified file 'lisp/calc/calc-units.el' --- lisp/calc/calc-units.el 2011-03-02 03:07:34 +0000 +++ lisp/calc/calc-units.el 2011-03-04 06:35:49 +0000 @@ -960,7 +960,10 @@ (if (eq base 'pi) (math-pi) expr))) - (if (Math-primp expr) + (if (or + (Math-primp expr) + (and (eq (car-safe expr) 'calcFunc-subscr) + (eq (car-safe (nth 1 expr)) 'var))) expr (cons (car expr) (mapcar 'math-to-standard-rec (cdr expr)))))) ------------------------------------------------------------ revno: 103509 author: Bob Rogers committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-03 21:16:56 -0800 message: Minor ewoc fix for bug#3261. * lisp/emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error if there is no node. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-04 05:00:40 +0000 +++ lisp/ChangeLog 2011-03-04 05:16:56 +0000 @@ -1,3 +1,8 @@ +2011-03-04 Bob Rogers + + * emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error + if there is no node. (Bug#3261) + 2011-03-04 Leo * time.el (display-time-world-list): Fix typo. (Bug#7571) === modified file 'lisp/emacs-lisp/ewoc.el' --- lisp/emacs-lisp/ewoc.el 2011-01-25 04:08:28 +0000 +++ lisp/emacs-lisp/ewoc.el 2011-03-04 05:16:56 +0000 @@ -495,6 +495,8 @@ ;; Never step below the first element. ;; (unless (ewoc--filter-hf-nodes ewoc node) ;; (setq node (ewoc--node-nth dll -2))) + (unless node + (error "No next")) (ewoc-goto-node ewoc node))) (defun ewoc-goto-node (ewoc node) ------------------------------------------------------------ revno: 103508 author: Julien Danjou committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-03 21:04:51 -0800 message: * lisp/erc/erc-track.el (erc-track-visibility): Fix :type. (Bug#6369) diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2011-02-10 16:56:00 +0000 +++ lisp/erc/ChangeLog 2011-03-04 05:04:51 +0000 @@ -1,3 +1,7 @@ +2011-03-04 Julien Danjou + + * erc-track.el (erc-track-visibility): Fix :type. (Bug#6369) + 2011-02-10 Stefan Monnier * erc-list.el (erc-list-menu-mode-map): Move initialization === modified file 'lisp/erc/erc-track.el' --- lisp/erc/erc-track.el 2011-02-09 04:08:25 +0000 +++ lisp/erc/erc-track.el 2011-03-04 05:04:51 +0000 @@ -84,8 +84,8 @@ :type '(choice (const :tag "All frames" t) (const :tag "All visible frames" visible) (const :tag "Only the selected frame" nil) - (const :tag "Only the selected frame if it was active" - active))) + (const :tag "Only the selected frame if it is visible" + selected-visible))) (defcustom erc-track-exclude nil "A list targets (channel names or query targets) which should not be tracked." ------------------------------------------------------------ revno: 103507 author: Leo committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-03 21:00:40 -0800 message: * lisp/time.el (display-time-world-list): Fix typo. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-04 04:51:14 +0000 +++ lisp/ChangeLog 2011-03-04 05:00:40 +0000 @@ -1,3 +1,7 @@ +2011-03-04 Leo + + * time.el (display-time-world-list): Fix typo. (Bug#7571) + 2011-03-04 Zachary Kanfer (tiny change) * cus-edit.el (custom-buffer-create-internal): === modified file 'lisp/time.el' --- lisp/time.el 2011-01-26 08:36:39 +0000 +++ lisp/time.el 2011-03-04 05:00:40 +0000 @@ -157,7 +157,7 @@ ;; Determine if zoneinfo style timezones are supported by testing that ;; America/New York and Europe/London return different timezones. (let (gmt nyt) - (set-time-zone-rule "America/New York") + (set-time-zone-rule "America/New_York") (setq nyt (format-time-string "%z")) (set-time-zone-rule "Europe/London") (setq gmt (format-time-string "%z")) ------------------------------------------------------------ revno: 103506 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-03 20:51:14 -0800 message: ChangeLog fixes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-04 02:24:47 +0000 +++ lisp/ChangeLog 2011-03-04 04:51:14 +0000 @@ -1,4 +1,4 @@ -2011-03-04 Zachary Kanfer +2011-03-04 Zachary Kanfer (tiny change) * cus-edit.el (custom-buffer-create-internal): Split search string before passing it to `customize-apropos' (bug#8136). @@ -104,8 +104,9 @@ 2011-03-01 Glenn Morris - * calendar/cal-hebrew.el (calendar-hebrew-birthday, diary-hebrew-date): - Rename and rework functions added in previous change. + * calendar/cal-hebrew.el (calendar-hebrew-birthday) + (diary-hebrew-birthday): Rename and rework functions added + in previous change. 2011-03-01 Ed Reingold @@ -820,7 +821,7 @@ * play/pong.el (pong-mode-map): * play/handwrite.el (menu-bar-handwrite-map): * play/gametree.el (gametree-mode-map): - * net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map + * net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map) (rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map): * net/newst-plainview.el (newsticker-menu, newsticker-mode-map) (newsticker--url-keymap): ------------------------------------------------------------ revno: 103505 author: Zachary Kanfer committer: Juanma Barranquero branch nick: trunk timestamp: Fri 2011-03-04 03:24:47 +0100 message: lisp/cus-edit.el (custom-buffer-create-internal): Fix bug#8136. Split search string before passing it to `customize-apropos'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-04 01:36:40 +0000 +++ lisp/ChangeLog 2011-03-04 02:24:47 +0000 @@ -1,3 +1,8 @@ +2011-03-04 Zachary Kanfer + + * cus-edit.el (custom-buffer-create-internal): + Split search string before passing it to `customize-apropos' (bug#8136). + 2011-03-04 Drew Adams * image-dired.el (image-dired-cmd-read-exif-data-options): === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2011-01-25 04:08:28 +0000 +++ lisp/cus-edit.el 2011-03-04 02:24:47 +0000 @@ -1599,7 +1599,7 @@ 'editable-field :size 40 :help-echo echo :action `(lambda (widget &optional event) - (customize-apropos (widget-value widget)))))) + (customize-apropos (split-string (widget-value widget))))))) (widget-insert " ") (widget-create-child-and-convert search-widget 'push-button ------------------------------------------------------------ revno: 103504 author: Drew Adams committer: Juanma Barranquero branch nick: trunk timestamp: Fri 2011-03-04 02:36:40 +0100 message: lisp/image-dired.el (image-dired-cmd-read-exif-data-options): Fix typo. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 16:02:52 +0000 +++ lisp/ChangeLog 2011-03-04 01:36:40 +0000 @@ -1,3 +1,8 @@ +2011-03-04 Drew Adams + + * image-dired.el (image-dired-cmd-read-exif-data-options): + Fix typo in docstring (bug#8156). + 2011-03-03 Deniz Dogan * net/rcirc.el (rcirc-cmd-join): Accept comma-separated input. === modified file 'lisp/image-dired.el' --- lisp/image-dired.el 2011-01-31 23:54:50 +0000 +++ lisp/image-dired.el 2011-03-04 01:36:40 +0000 @@ -384,7 +384,7 @@ "%p -s -s -s -%t \"%f\"" "Format of command used to read EXIF data. Available options are %p which is replaced by -`image-dired-cmd-write-exif-data-options', %f which is replaced +`image-dired-cmd-write-exif-data-program', %f which is replaced by the image file name and %t which is replaced by the tag name." :type 'string :group 'image-dired) ------------------------------------------------------------ revno: 103503 committer: Deniz Dogan branch nick: emacs-trunk timestamp: Thu 2011-03-03 17:02:52 +0100 message: Fixing old typo. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 15:56:38 +0000 +++ lisp/ChangeLog 2011-03-03 16:02:52 +0000 @@ -767,7 +767,7 @@ 2011-02-11 Deniz Dogan - * net/rcirc.el (defun-rcirc-join): Accept multiple channels. + * net/rcirc.el (rcirc-cmd-join): Accept multiple channels. 2011-02-11 Glenn Morris ------------------------------------------------------------ revno: 103502 committer: Deniz Dogan branch nick: emacs-trunk timestamp: Thu 2011-03-03 16:56:38 +0100 message: * lisp/net/rcirc.el (rcirc-cmd-join): Accept comma-separated input. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 13:21:50 +0000 +++ lisp/ChangeLog 2011-03-03 15:56:38 +0000 @@ -1,3 +1,7 @@ +2011-03-03 Deniz Dogan + + * net/rcirc.el (rcirc-cmd-join): Accept comma-separated input. + 2011-03-03 Christian Ohler * emacs-lisp/ert.el (ert--explain-equal): New function. === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-02-17 11:41:49 +0000 +++ lisp/net/rcirc.el 2011-03-03 15:56:38 +0000 @@ -2104,7 +2104,8 @@ (let* ((split-channels (split-string channels "[ ,]" t)) (buffers (mapcar (lambda (ch) (rcirc-get-buffer-create process ch)) - split-channels))) + split-channels)) + (channels (mapconcat 'identity split-channels ","))) (rcirc-send-string process (concat "JOIN " channels)) (when (not (eq (selected-window) (minibuffer-window))) (dolist (b buffers) ;; order the new channel buffers in the buffer list ------------------------------------------------------------ revno: 103501 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-03-03 13:21:50 +0000 message: Merge changes made in Gnus trunk. nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with numbers too big to be `read'. password-cache.el (password-in-cache-p): Add autoload. message.el (message-options): Make buffer-local two ways to attempt to fix a XEmacs bug. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 09:10:19 +0000 +++ lisp/ChangeLog 2011-03-03 13:21:50 +0000 @@ -44,6 +44,10 @@ * vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries with no parents. (Bug#8025) +2011-03-02 Teodor Zlatanov + + * password-cache.el (password-in-cache-p): Add autoload. + 2011-03-02 Glenn Morris * man.el (Man-support-local-filenames): Also handle Red Hat's man. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-02 12:34:12 +0000 +++ lisp/gnus/ChangeLog 2011-03-03 13:21:50 +0000 @@ -1,3 +1,13 @@ +2011-03-03 Tassilo Horn + + * nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with + numbers too big to be `read'. + +2011-03-02 Teodor Zlatanov + + * message.el (message-options): Make buffer-local two ways to attempt + to fix a XEmacs bug. + 2011-03-02 Julien Danjou * gnus-art.el (gnus-with-article-buffer): Fix buffer live check. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-02-15 11:24:37 +0000 +++ lisp/gnus/message.el 2011-03-03 13:21:50 +0000 @@ -1814,7 +1814,10 @@ (defvar message-options nil "Some saved answers when sending message.") -(make-variable-buffer-local 'message-options) + +(if (featurep 'xemacs) + (make-local-variable 'message-options) + (make-variable-buffer-local 'message-options)) (defvar message-send-mail-real-function nil "Internal send mail function.") === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-02-25 12:53:00 +0000 +++ lisp/gnus/nnimap.el 2011-03-03 13:21:50 +0000 @@ -1496,10 +1496,22 @@ (setq start (point)) (goto-char end)) (while (re-search-forward "^\\* [0-9]+ FETCH " start t) - (setq elems (read (current-buffer))) - (push (cons (cadr (memq 'UID elems)) - (cadr (memq 'FLAGS elems))) - articles)) + (let ((p (point))) + ;; FIXME: For FETCH lines like "* 2971 FETCH (FLAGS (%Recent) UID + ;; 12509 MODSEQ (13419098521433281274))" we get an + ;; overflow-error. The handler simply deletes that large number + ;; and reads again. But maybe there's a better fix... + (setq elems (condition-case nil (read (current-buffer)) + (overflow-error + ;; After an overflow-error, point is just after + ;; the too large number. So delete it and try + ;; again. + (delete-region (point) (progn (backward-word) (point))) + (goto-char p) + (read (current-buffer))))) + (push (cons (cadr (memq 'UID elems)) + (cadr (memq 'FLAGS elems))) + articles))) (push (nconc (list group uidnext totalp permanent-flags uidvalidity vanished highestmodseq) articles) === modified file 'lisp/password-cache.el' --- lisp/password-cache.el 2011-02-25 23:52:19 +0000 +++ lisp/password-cache.el 2011-03-03 13:21:50 +0000 @@ -76,6 +76,7 @@ key (symbol-value (intern-soft key password-data)))) +;;;###autoload (defun password-in-cache-p (key) "Check if KEY is in the cache." (and password-cache ------------------------------------------------------------ revno: 103500 [merge] committer: Christian Ohler branch nick: trunk timestamp: Thu 2011-03-03 02:10:19 -0700 message: Merged an ERT fix and a speedup. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 08:19:34 +0000 +++ lisp/ChangeLog 2011-03-03 09:10:19 +0000 @@ -1,3 +1,19 @@ +2011-03-03 Christian Ohler + + * emacs-lisp/ert.el (ert--explain-equal): New function. + (ert--explain-equal-rec): Renamed from `ert--explain-not-equal'. + All callers changed. + (ert--explain-equal-including-properties): Renamed from + `ert--explain-not-equal-including-properties'. All callers + changed. + +2011-03-03 Christian Ohler + + * emacs-lisp/ert.el (ert--stats-set-test-and-result) + (ert-char-for-test-result, ert-string-for-test-result) + (ert-run-tests-batch, ert--print-test-for-ewoc): + Handle `ert-test-quit'. + 2011-03-03 David Abrahams (tiny change) * vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs): === modified file 'lisp/emacs-lisp/ert.el' --- lisp/emacs-lisp/ert.el 2011-02-18 04:20:36 +0000 +++ lisp/emacs-lisp/ert.el 2011-03-03 09:01:51 +0000 @@ -219,7 +219,7 @@ ;; This implementation is inefficient. Rather than making it ;; efficient, let's hope bug 6581 gets fixed so that we can delete ;; it altogether. - (not (ert--explain-not-equal-including-properties a b))) + (not (ert--explain-equal-including-properties a b))) ;;; Defining and locating tests. @@ -571,16 +571,15 @@ (when (and (not firstp) (eq fast slow)) (return nil)))) (defun ert--explain-format-atom (x) - "Format the atom X for `ert--explain-not-equal'." + "Format the atom X for `ert--explain-equal'." (typecase x (fixnum (list x (format "#x%x" x) (format "?%c" x))) (t x))) -(defun ert--explain-not-equal (a b) - "Explainer function for `equal'. +(defun ert--explain-equal-rec (a b) + "Returns a programmer-readable explanation of why A and B are not `equal'. -Returns a programmer-readable explanation of why A and B are not -`equal', or nil if they are." +Returns nil if they are." (if (not (equal (type-of a) (type-of b))) `(different-types ,a ,b) (etypecase a @@ -598,13 +597,13 @@ (loop for i from 0 for ai in a for bi in b - for xi = (ert--explain-not-equal ai bi) + for xi = (ert--explain-equal-rec ai bi) do (when xi (return `(list-elt ,i ,xi))) finally (assert (equal a b) t))) - (let ((car-x (ert--explain-not-equal (car a) (car b)))) + (let ((car-x (ert--explain-equal-rec (car a) (car b)))) (if car-x `(car ,car-x) - (let ((cdr-x (ert--explain-not-equal (cdr a) (cdr b)))) + (let ((cdr-x (ert--explain-equal-rec (cdr a) (cdr b)))) (if cdr-x `(cdr ,cdr-x) (assert (equal a b) t) @@ -618,7 +617,7 @@ (loop for i from 0 for ai across a for bi across b - for xi = (ert--explain-not-equal ai bi) + for xi = (ert--explain-equal-rec ai bi) do (when xi (return `(array-elt ,i ,xi))) finally (assert (equal a b) t)))) (atom (if (not (equal a b)) @@ -627,7 +626,15 @@ `(different-atoms ,(ert--explain-format-atom a) ,(ert--explain-format-atom b))) nil))))) -(put 'equal 'ert-explainer 'ert--explain-not-equal) + +(defun ert--explain-equal (a b) + "Explainer function for `equal'." + ;; Do a quick comparison in C to avoid running our expensive + ;; comparison when possible. + (if (equal a b) + nil + (ert--explain-equal-rec a b))) +(put 'equal 'ert-explainer 'ert--explain-equal) (defun ert--significant-plist-keys (plist) "Return the keys of PLIST that have non-null values, in order." @@ -658,8 +665,8 @@ (value-b (plist-get b key))) (assert (not (equal value-a value-b)) t) `(different-properties-for-key - ,key ,(ert--explain-not-equal-including-properties value-a - value-b))))) + ,key ,(ert--explain-equal-including-properties value-a + value-b))))) (cond (keys-in-a-not-in-b (explain-with-key (first keys-in-a-not-in-b))) (keys-in-b-not-in-a @@ -681,13 +688,16 @@ (t (substring s 0 len))))) -(defun ert--explain-not-equal-including-properties (a b) +;; TODO(ohler): Once bug 6581 is fixed, rename this to +;; `ert--explain-equal-including-properties-rec' and add a fast-path +;; wrapper like `ert--explain-equal'. +(defun ert--explain-equal-including-properties (a b) "Explainer function for `ert-equal-including-properties'. Returns a programmer-readable explanation of why A and B are not `ert-equal-including-properties', or nil if they are." (if (not (equal a b)) - (ert--explain-not-equal a b) + (ert--explain-equal a b) (assert (stringp a) t) (assert (stringp b) t) (assert (eql (length a) (length b)) t) @@ -713,7 +723,7 @@ ))) (put 'ert-equal-including-properties 'ert-explainer - 'ert--explain-not-equal-including-properties) + 'ert--explain-equal-including-properties) ;;; Implementation of `ert-info'. @@ -1244,12 +1254,14 @@ (ert-test-passed (incf (ert--stats-passed-expected stats) d)) (ert-test-failed (incf (ert--stats-failed-expected stats) d)) (null) - (ert-test-aborted-with-non-local-exit)) + (ert-test-aborted-with-non-local-exit) + (ert-test-quit)) (etypecase (aref results pos) (ert-test-passed (incf (ert--stats-passed-unexpected stats) d)) (ert-test-failed (incf (ert--stats-failed-unexpected stats) d)) (null) - (ert-test-aborted-with-non-local-exit))))) + (ert-test-aborted-with-non-local-exit) + (ert-test-quit))))) ;; Adjust counters to remove the result that is currently in stats. (update -1) ;; Put new test and result into stats. @@ -1342,7 +1354,8 @@ (ert-test-passed ".P") (ert-test-failed "fF") (null "--") - (ert-test-aborted-with-non-local-exit "aA")))) + (ert-test-aborted-with-non-local-exit "aA") + (ert-test-quit "qQ")))) (elt s (if expectedp 0 1)))) (defun ert-string-for-test-result (result expectedp) @@ -1353,7 +1366,8 @@ (ert-test-passed '("passed" "PASSED")) (ert-test-failed '("failed" "FAILED")) (null '("unknown" "UNKNOWN")) - (ert-test-aborted-with-non-local-exit '("aborted" "ABORTED"))))) + (ert-test-aborted-with-non-local-exit '("aborted" "ABORTED")) + (ert-test-quit '("quit" "QUIT"))))) (elt s (if expectedp 0 1)))) (defun ert--pp-with-indentation-and-newline (object) @@ -1478,7 +1492,9 @@ (message "%s" (buffer-string)))) (ert-test-aborted-with-non-local-exit (message "Test %S aborted with non-local exit" - (ert-test-name test))))) + (ert-test-name test))) + (ert-test-quit + (message "Quit during %S" (ert-test-name test))))) (let* ((max (prin1-to-string (length (ert--stats-tests stats)))) (format-string (concat "%9s %" (prin1-to-string (length max)) @@ -1853,7 +1869,9 @@ (ert-test-result-with-condition-condition result)) (ert--make-xrefs-region begin (point))))) (ert-test-aborted-with-non-local-exit - (insert " aborted\n"))) + (insert " aborted\n")) + (ert-test-quit + (insert " quit\n"))) (insert "\n"))))) nil) === modified file 'test/ChangeLog' --- test/ChangeLog 2011-02-20 14:35:58 +0000 +++ test/ChangeLog 2011-03-03 09:01:51 +0000 @@ -1,3 +1,8 @@ +2011-03-03 Christian Ohler + + * automated/ert-tests.el (ert-test-explain-not-equal-keymaps): + New test. + 2011-02-20 Ulf Jasper * automated/icalendar-tests.el: Move from icalendar-testsuite.el; === modified file 'test/automated/ert-tests.el' --- test/automated/ert-tests.el 2011-01-25 04:08:28 +0000 +++ test/automated/ert-tests.el 2011-03-03 09:01:51 +0000 @@ -796,27 +796,32 @@ (should (equal (ert--string-first-line "foo\nbar") "foo")) (should (equal (ert--string-first-line " foo\nbar\nbaz\n") " foo"))) -(ert-deftest ert-test-explain-not-equal () - (should (equal (ert--explain-not-equal nil 'foo) +(ert-deftest ert-test-explain-equal () + (should (equal (ert--explain-equal nil 'foo) '(different-atoms nil foo))) - (should (equal (ert--explain-not-equal '(a a) '(a b)) + (should (equal (ert--explain-equal '(a a) '(a b)) '(list-elt 1 (different-atoms a b)))) - (should (equal (ert--explain-not-equal '(1 48) '(1 49)) + (should (equal (ert--explain-equal '(1 48) '(1 49)) '(list-elt 1 (different-atoms (48 "#x30" "?0") (49 "#x31" "?1"))))) - (should (equal (ert--explain-not-equal 'nil '(a)) + (should (equal (ert--explain-equal 'nil '(a)) '(different-types nil (a)))) - (should (equal (ert--explain-not-equal '(a b c) '(a b c d)) + (should (equal (ert--explain-equal '(a b c) '(a b c d)) '(proper-lists-of-different-length 3 4 (a b c) (a b c d) first-mismatch-at 3))) (let ((sym (make-symbol "a"))) - (should (equal (ert--explain-not-equal 'a sym) + (should (equal (ert--explain-equal 'a sym) `(different-symbols-with-the-same-name a ,sym))))) -(ert-deftest ert-test-explain-not-equal-improper-list () - (should (equal (ert--explain-not-equal '(a . b) '(a . c)) +(ert-deftest ert-test-explain-equal-improper-list () + (should (equal (ert--explain-equal '(a . b) '(a . c)) '(cdr (different-atoms b c))))) +(ert-deftest ert-test-explain-equal-keymaps () + ;; This used to be very slow. + (should (equal (make-keymap) (make-keymap))) + (should (equal (make-sparse-keymap) (make-sparse-keymap)))) + (ert-deftest ert-test-significant-plist-keys () (should (equal (ert--significant-plist-keys '()) '())) (should (equal (ert--significant-plist-keys '(a b c d e f c g p q r nil s t)) @@ -852,21 +857,21 @@ (should (equal (ert--abbreviate-string "bar" 1 t) "r")) (should (equal (ert--abbreviate-string "bar" 0 t) ""))) -(ert-deftest ert-test-explain-not-equal-string-properties () +(ert-deftest ert-test-explain-equal-string-properties () (should - (equal (ert--explain-not-equal-including-properties #("foo" 0 1 (a b)) - "foo") + (equal (ert--explain-equal-including-properties #("foo" 0 1 (a b)) + "foo") '(char 0 "f" (different-properties-for-key a (different-atoms b nil)) context-before "" context-after "oo"))) - (should (equal (ert--explain-not-equal-including-properties + (should (equal (ert--explain-equal-including-properties #("foo" 1 3 (a b)) #("goo" 0 1 (c d))) '(array-elt 0 (different-atoms (?f "#x66" "?f") (?g "#x67" "?g"))))) (should - (equal (ert--explain-not-equal-including-properties + (equal (ert--explain-equal-including-properties #("foo" 0 1 (a b c d) 1 3 (a b)) #("foo" 0 1 (c d a b) 1 2 (a foo))) '(char 1 "o" (different-properties-for-key a (different-atoms b foo)) ------------------------------------------------------------ revno: 103499 author: David Abrahams committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-03 00:19:34 -0800 message: ediff-init.el fix for bug#1821. (tiny change) Tiny change; note that author said he placed it in the public domain. (If this wasn't a tiny change, we would still need paperwork.) * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs): Move ediff-defvar-local calls after defcustoms. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 08:10:52 +0000 +++ lisp/ChangeLog 2011-03-03 08:19:34 +0000 @@ -1,3 +1,8 @@ +2011-03-03 David Abrahams (tiny change) + + * vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs): + Move ediff-defvar-local calls after defcustoms. (Bug#1821) + 2011-03-03 Glenn Morris * files.el (file-truename): Doc fix. (Bug#2341) === modified file 'lisp/vc/ediff-init.el' --- lisp/vc/ediff-init.el 2011-01-25 04:08:28 +0000 +++ lisp/vc/ediff-init.el 2011-03-03 08:19:34 +0000 @@ -560,7 +560,6 @@ :group 'ediff) -(ediff-defvar-local ediff-use-faces t "") (defcustom ediff-use-faces t "If t, differences are highlighted using faces, if device supports faces. If nil, differences are highlighted using ASCII flags, ediff-before-flag @@ -568,6 +567,7 @@ highlighted using ASCII flags." :type 'boolean :group 'ediff-highlighting) +(ediff-defvar-local ediff-use-faces t "") ;; this indicates that diff regions are word-size, so fine diffs are ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise @@ -604,13 +604,13 @@ :type 'boolean :group 'ediff) -(ediff-defvar-local ediff-highlight-all-diffs t "") (defcustom ediff-highlight-all-diffs t "If nil, only the selected differences are highlighted. Otherwise, all difference regions are highlighted, but the selected region is shown in brighter colors." :type 'boolean :group 'ediff-highlighting) +(ediff-defvar-local ediff-highlight-all-diffs t "") ;; The suffix of the control buffer name. ------------------------------------------------------------ revno: 103498 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-03 00:13:09 -0800 message: Merge fix. diff: === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-02-28 01:07:29 +0000 +++ lisp/org/ChangeLog 2011-03-03 08:13:09 +0000 @@ -1,14 +1,3 @@ -2011-02-28 Juanma Barranquero - - * org.el (org-maybe-keyword-time-regexp): - * org-icalendar.el (org-icalendar-store-UID): - * org-agenda.el (org-agenda-scheduled-leaders) - (org-agenda-deadline-leaders, org-agenda-filter-preset): - * org-table.el (org-table-current-line-types) - (org-table-current-begin-line, org-table-current-begin-pos): - (org-table-current-field-formula): - Fix typos in docstrings. - 2011-02-10 Stefan Monnier * org-remember.el (org-remember-mode-map): ------------------------------------------------------------ revno: 103497 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-03 00:10:52 -0800 message: file-truename doc fix for bug#2341. * lisp/files.el (file-truename): Doc fix. * doc/lispref/files.texi (Truenames): Minor clarification. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-03-01 03:05:28 +0000 +++ doc/lispref/ChangeLog 2011-03-03 08:10:52 +0000 @@ -1,3 +1,7 @@ +2011-03-03 Glenn Morris + + * files.texi (Truenames): Minor clarification. (Bug#2341) + 2011-03-01 Glenn Morris * variables.texi (Directory Local Variables): === modified file 'doc/lispref/files.texi' --- doc/lispref/files.texi 2011-02-19 19:40:59 +0000 +++ doc/lispref/files.texi 2011-03-03 08:10:52 +0000 @@ -1041,7 +1041,8 @@ @defun file-truename filename The function @code{file-truename} returns the truename of the file -@var{filename}. The argument must be an absolute file name. +@var{filename}. If the argument is not an absolute file name, +this function first expands it against @code{default-directory}. This function does not expand environment variables. Only @code{substitute-in-file-name} does that. @xref{Definition of === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-03 07:33:35 +0000 +++ lisp/ChangeLog 2011-03-03 08:10:52 +0000 @@ -1,3 +1,7 @@ +2011-03-03 Glenn Morris + + * files.el (file-truename): Doc fix. (Bug#2341) + 2011-03-03 Bob Rogers * vc/vc-dir.el (vc-dir-mode-map): Bind vc-dir-find-file to e. (Bug#7349) === modified file 'lisp/files.el' --- lisp/files.el 2011-03-01 04:26:38 +0000 +++ lisp/files.el 2011-03-03 08:10:52 +0000 @@ -983,7 +983,8 @@ nil))) (defun file-truename (filename &optional counter prev-dirs) - "Return the truename of FILENAME, which should be absolute. + "Return the truename of FILENAME. +If FILENAME is not absolute, first expands it against `default-directory'. The truename of a file name is found by chasing symbolic links both at the level of the file and at the level of the directories containing it, until no links are left at any level. ------------------------------------------------------------ revno: 103496 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-03 00:03:01 -0800 message: Reduce some of the many, many variant spellings of NeXTstep. http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00986.html diff: === modified file 'configure.in' --- configure.in 2011-02-25 06:42:06 +0000 +++ configure.in 2011-03-03 08:03:01 +0000 @@ -162,7 +162,7 @@ OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars]) OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d]) OPTION_DEFAULT_ON([xim],[don't use X11 XIM]) -OPTION_DEFAULT_OFF([ns],[use nextstep (Cocoa or GNUstep) windowing system]) +OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system]) OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support]) === modified file 'doc/misc/faq.texi' --- doc/misc/faq.texi 2011-02-16 08:39:19 +0000 +++ doc/misc/faq.texi 2011-03-03 08:03:01 +0000 @@ -1042,11 +1042,11 @@ @item Emacs can be started as a daemon in the background. -@cindex NeXTSTEP port +@cindex NeXTstep port @cindex GNUstep port @cindex Mac OS X Cocoa @item -There is a new NeXTSTEP port of Emacs. This supports GNUstep and Mac OS +There is a new NeXTstep port of Emacs. This supports GNUstep and Mac OS X (via the Cocoa libraries). The Carbon port of Emacs, which supported Mac OS X in Emacs 22, has been removed. === modified file 'etc/NEWS.23' --- etc/NEWS.23 2011-02-28 01:07:29 +0000 +++ etc/NEWS.23 2011-03-03 08:03:01 +0000 @@ -129,7 +129,7 @@ * Changes in Emacs 23.3 on non-free operating systems -** The nextstep port can have different modifiers for the left and right +** The NeXTstep port can have different modifiers for the left and right alt/option key by customizing the value for ns-right-alternate-modifier. @@ -697,7 +697,7 @@ *** Emacs now supports multi-page TIFF images. -** New NeXTSTEP-based port. +** New NeXTstep-based port. This provides support for GNUstep (via the GNUstep libraries) and Mac OS X (via the Cocoa libraries). @@ -707,7 +707,7 @@ nextstep/README and nextstep/INSTALL in the Emacs source directory. ** Mac OS X is no longer supported via Carbon. -Use the NeXTSTEP port, described above. +Use the NeXTstep port, described above. ** The new configuration option "--with-dbus" enables D-Bus language bindings for Emacs. === modified file 'lisp/find-file.el' --- lisp/find-file.el 2011-01-25 04:08:28 +0000 +++ lisp/find-file.el 2011-03-03 08:03:01 +0000 @@ -183,7 +183,7 @@ ;;;###autoload (defvar ff-special-constructs `( - ;; C/C++ include, for NeXTSTEP too + ;; C/C++ include, for NeXTstep too (,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") . (lambda () (buffer-substring (match-beginning 2) (match-end 2)))) === modified file 'nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj' --- nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj 2009-06-04 23:21:22 +0000 +++ nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj 2011-03-03 08:03:01 +0000 @@ -245,7 +245,7 @@ name = Products; sourceTree = ""; }; - 289FC26B00C69A287F000001 /* NeXTStep */ = { + 289FC26B00C69A287F000001 /* NeXTstep */ = { isa = PBXGroup; children = ( 3C4D6D710DE50D5D00B20D4E /* nsfont.m */, @@ -257,13 +257,13 @@ 090AF68100C61DCD7F000001 /* nsselect.m */, 090AF68300C61DCD7F000001 /* nsterm.m */, ); - name = NeXTStep; + name = NeXTstep; sourceTree = ""; }; 29B97314FDCFA39411CA2CEA /* Emacs */ = { isa = PBXGroup; children = ( - 289FC26B00C69A287F000001 /* NeXTStep */, + 289FC26B00C69A287F000001 /* NeXTstep */, 3C15C23E0902E6B000A8542F /* emacs-hdr */, 3CDCED4D0902EA6800B2EF7E /* emacs-src */, 29B97317FDCFA39411CA2CEA /* Resources */, === modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist' --- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-03-03 07:57:49 +0000 +++ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-03-03 08:03:01 +0000 @@ -7,8 +7,8 @@ "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", "Scott Bender (OpenStep)", - "Christian Limpach (NeXTStep)", - "Carl Edman (NeXTStep)", + "Christian Limpach (NeXTstep)", + "Carl Edman (NeXTstep)", "..see etc/NEXTSTEP" ); Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; === modified file 'src/nsterm.m' --- src/nsterm.m 2011-02-23 20:41:43 +0000 +++ src/nsterm.m 2011-03-03 08:03:01 +0000 @@ -189,7 +189,7 @@ *ns_pending_service_args; static BOOL inNsSelect = 0; -/* Convert modifiers in a NeXTSTEP event to emacs style modifiers. */ +/* Convert modifiers in a NeXTstep event to emacs style modifiers. */ #define NS_FUNCTION_KEY_MASK 0x800000 #define NSLeftControlKeyMask (0x000001 | NSControlKeyMask) #define NSRightControlKeyMask (0x002000 | NSControlKeyMask) ------------------------------------------------------------ revno: 103495 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-02 23:57:49 -0800 message: Info-gnustep.plist trivia. * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: Refer to etc/NEXTSTEP rather than emacs-app.sf.net. diff: === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2011-01-25 04:08:28 +0000 +++ nextstep/ChangeLog 2011-03-03 07:57:49 +0000 @@ -1,3 +1,8 @@ +2011-03-03 Glenn Morris + + * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + Refer to etc/NEXTSTEP rather than emacs-app.sf.net. + 2011-01-02 Glenn Morris * Cocoa/Emacs.base/Contents/Info.plist: === modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist' --- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-02-16 08:39:19 +0000 +++ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-03-03 07:57:49 +0000 @@ -9,7 +9,7 @@ "Scott Bender (OpenStep)", "Christian Limpach (NeXTStep)", "Carl Edman (NeXTStep)", - "..see http://emacs-app.sf.net/authorship.html" + "..see etc/NEXTSTEP" ); Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.