Merge from emacs--devo--0
[bpt/emacs.git] / lisp / ChangeLog
index 8ea68f0..ab50949 100644 (file)
@@ -5,25 +5,6 @@
 
 2007-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * diff-mode.el (diff-auto-refine): New var.
-       (diff-hunk): Use it.
-       (diff-ignore-whitespace-hunk): Rename diff-refine-ignore-spaces-hunk.
-       (diff-refine-change): Rename from diff-fine-change.  Change it.
-       (diff-refine-preproc): Rename from diff-fine-highlight-preproc.
-       (diff-refine-hunk): Rename from diff-fine-highlight.
-
-2007-10-20  John Paul Wallington  <jpw@pobox.com>
-
-       * help-fns.el (describe-variable-custom-version-info): New function
-       to return variable's version or package version note.
-       (describe-variable): Use it, display result.
-
-2007-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-       * smerge-mode.el (smerge-auto-refine): New var.
-       (smerge-next, smerge-prev): Use it.
-       (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
-
        * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
        Add `body' arg.  Cleanup the check-narrow-maybe/re-narrow-maybe mess.
 
        (suspend-tty-functions, resume-tty-functions): Install extra hooks
        for multi-tty.
 
+2007-10-10  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+       * ps-print.el: Fix the usage of :foreground and :background face
+       attributes.  Reported by Nikolaj Schumacher <n_schumacher@web.de>.
+       (ps-print-version): New version 7.2.5.
+       (ps-face-attributes, ps-face-attribute-list, ps-face-background): Fix
+       code.
+       (ps-face-foreground-color-p, ps-face-background-color-p)
+       (ps-face-color-p): New inline funs.
+       (ps-background, ps-begin-file, ps-build-reference-face-lists): Use
+       `mapc' rather than `mapcar'.
+
+
 2007-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (invisible-p): Remove: implemented in C now.