merge trunk

1 files changed, 220 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 962b1618fbd..868667e4103 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,205 @@
         * international/fontset.el (setup-default-fontset): Fix typo for
         arabic OTF spec (fini->fina).
 
+2010-08-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * whitespace.el: Allow cleaning up blanks without blank
+        visualization (Bug#6651).  Adjust help window for
+        whitespace-toggle-options (Bug#6479).  Allow to use fill-column
+        instead of whitespace-line-column (from EmacsWiki).  New version
+        13.1.
+        (whitespace-style): Added new value 'face.  Adjust docstring.
+        (whitespace-space, whitespace-hspace, whitespace-tab): Adjust
+        foreground property face.
+        (whitespace-line-column): Adjust docstring and type declaration.
+        (whitespace-style-value-list, whitespace-toggle-option-alist)
+        (whitespace-help-text): Adjust const initialization.
+        (whitespace-toggle-options, global-whitespace-toggle-options):
+        Adjust docstring.
+        (whitespace-display-window, whitespace-interactive-char)
+        (whitespace-style-face-p, whitespace-color-on): Adjust code.
+        (whitespace-help-scroll): New fun.
+
+2010-08-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (list-packages): Alias for
+        package-list-packages.
+
+2010-08-24  Kevin Ryde  <user42@zip.com.au>
+
+        * textmodes/flyspell.el (flyspell-check-tex-math-command): Doc fix
+        (Bug#5651).
+
+        * progmodes/ruby-mode.el (ruby): Add defgroup.
+
+2010-08-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/python.el: Add Ipython support (Bug#5390).
+        (python-shell-prompt-alist)
+        (python-shell-continuation-prompt-alist): New options.
+        (python--set-prompt-regexp): New function.
+        (inferior-python-mode, run-python, python-shell): Require
+        ansi-color.  Use python--set-prompt-regexp to set the comint
+        prompt based on the Python interpreter.
+        (python--prompt-regexp): New var.
+        (python-check-comint-prompt)
+        (python-comint-output-filter-function): Use it.
+        (run-python): Use a pipe (Bug#5694).
+
+2010-08-24  Fabian Ezequiel Gallina  <galli.87@gmail.com>  (tiny change)
+
+        * progmodes/python.el (python-send-region): Send a different
+        Python command if Ipython is in use.
+        (python-check-version): Use a Python command to find the version.
+
+2010-08-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mouse.el (mouse-yank-primary): Avoid setting primary when
+        deactivating the mark (Bug#6872).
+
+2010-08-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/dbus.el: Accept UNIX domain sockets as bus address.
+        (top): Don't initialize `dbus-registered-objects-table' anymore,
+        this is done in dbusbind,c.
+        (dbus-check-event): Adapt test for bus.
+        (dbus-return-values-table, dbus-unregister-service)
+        (dbus-event-bus-name, dbus-introspect, dbus-register-property):
+        Adapt doc string.
+
+2010-08-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ido.el (ido-use-virtual-buffers): Fix typo in docstring.
+
+2010-08-22  Juri Linkov  <juri@jurta.org>
+
+        * simple.el (read-extended-command): New function with the logic
+        for `completing-read' moved to Elisp from `execute-extended-command'.
+        Use `function-called-at-point' in `minibuffer-default-add-function'
+        to get a command name for M-n (bug#5364, bug#5214).
+
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (command-line-1): Issue warning for ignored arguments
+        --unibyte, etc (Bug#6886).
+
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix (Bug#6880).
+
+2010-08-22  Leo  <sdl.web@gmail.com>
+
+        Fix buffer-list rename&refresh after after killing a buffer in ido.
+        * lisp/ido.el: Revert Óscar's.
+        (ido-kill-buffer-at-head): Exit the minibuffer with ido-exit=refresh.
+        Remember the buffers at head, rather than their name.
+        * lisp/iswitchb.el (iswitchb-kill-buffer): Re-make the list.
+
+2010-08-22  Kirk Kelsey  <kirk.kelsey@0x4b.net>  (tiny change)
+            Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/make-mode.el (makefile-fill-paragraph): Account for the
+        extra backslash added to each line (bug#6890).
+
+2010-08-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (read-key): Don't echo keystrokes (bug#6883).
+
+2010-08-22  Glenn Morris  <rgm@gnu.org>
+
+        * menu-bar.el (menu-bar-games-menu): Add landmark.
+
+2010-08-22  Glenn Morris  <rgm@gnu.org>
+
+        * align.el (align-regexp): Make group and spacing arguments
+        use the interactive defaults when non-interactive.  (Bug#6698)
+
+        * mail/rmail.el (rmail-forward): Replace mail-text-start with its
+        expansion, so as not to need sendmail.
+        (mail-text-start): Remove declaration.
+        (rmail-retry-failure): Require sendmail.
+
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * subr.el (read-key): Don't hide the menu-bar entries (bug#6881).
+
+2010-08-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        * progmodes/flymake.el (flymake-start-syntax-check-process):
+        Use `start-file-process' in order to let it run also on remote hosts.
+
+2010-08-22  Kenichi Handa  <handa@m17n.org>
+
+        * files.el: Add `word-wrap' as safe local variable.
+
+2010-08-22  Glenn Morris  <rgm@gnu.org>
+
+        * woman.el (woman-translate): Case matters.  (Bug#6849)
+
+2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (kill-region): Doc fix (Bug#6787).
+
+2010-08-22  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/diary-lib.el (diary-header-line-format):
+        Fit it to the window, not the frame.
+
+2010-08-22  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * subr.el (ignore-errors): Add debug declaration.
+
+2010-08-22  Geoff Gole  <geoffgole@gmail.com>  (tiny change)
+
+        * whitespace.el (whitespace-color-off): Remove post-command-hook
+        locally.
+
+2010-08-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/add-log.el (add-log-file-name): Don't get confused by symlinks.
+
+2010-08-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (custom-group-value-create): Add extra newline
+        before end line (Bug#6876).
+
+2010-08-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mouse.el (mouse-save-then-kill): Don't save region to kill ring
+        when extending it.  Before killing on the second click, check if
+        the buffer is the correct one.  Doc fix.
+        (mouse-secondary-save-then-kill): Allow usage without first
+        calling mouse-start-secondary, by defaulting to point.  Don't save
+        an empty secondary selection.  Doc fix.
+
+2010-08-21  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * whitespace.el: Fix slow cursor movement (Bug#6172).  Reported by
+        Christoph Groth <cwg@falma.de> and Liu Xin <x_liu@neusoft.com>.
+        New version 13.0.
+        (whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp):
+        Adjust initialization.
+        (whitespace-bob-marker, whitespace-eob-marker)
+        (whitespace-buffer-changed): New vars.
+        (whitespace-cleanup, whitespace-color-on, whitespace-color-off)
+        (whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp)
+        (whitespace-post-command-hook, whitespace-display-char-on):
+        Adjust code.
+        (whitespace-looking-back, whitespace-buffer-changed): New funs.
+        (whitespace-space-regexp, whitespace-tab-regexp): Fun eliminated.
+
+2010-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (locate-file-completion-table): Only list the .el and .elc
+        extensions if there's no other choice (bug#5955).
+
+        * facemenu.el (facemenu-self-insert-data): New var.
+        (facemenu-post-self-insert-function, facemenu-set-self-insert-face):
+        New functions.
+        (facemenu-add-face): Use them.
+
+        * simple.el (blink-matching-open): Obey forward-sexp-function.
+
 2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (prog-mode-map): New var.
@@ -34,6 +233,17 @@
         * emacs-lisp/autoload.el (make-autoload): Preload the macros's
         declarations that are useful before running the macro.
 
+2010-08-18  Joakim Verona  <joakim@verona.se>
+
+        * image.el (imagemagick-types-inhibit): New variable.
+        (imagemagick-register-types): New function.
+        * image-mode.el (image-transform-properties): New function.
+        (image-transform-set-scale, image-transform-fit-to-height)
+        (image-transform-set-rotation, image-transform-set-resize)
+        (image-transform-fit-to-width, image-transform-fit-to-height):
+        New functions.
+        (image-toggle-display-image): Support image transforms.
+
 2010-08-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * image.el (create-animated-image): Don't add heuristic mask to image
@@ -297,7 +507,7 @@
         (ctext-standard-encodings): New variable.
         (ctext-non-standard-encodings-table): List only elements for
         non-standard encodings.
-        (ctext-pre-write-conversion): Adjusted for the above change.
+        (ctext-pre-write-conversion): Adjust for the above change.
         Check ctext-standard-encodings.
 
         * international/mule-conf.el (compound-text): Doc fix.
@@ -3186,7 +3396,8 @@
         * minibuffer.el (tags-completion-at-point-function): New function.
         (completion-at-point-functions): Use it.
 
-        * cedet/semantic.el (semantic-completion-at-point-function): New function.
+        * cedet/semantic.el (semantic-completion-at-point-function):
+        New function.
         (semantic-mode): Use semantic-completion-at-point-function for
         completion-at-point-functions instead.
 
@@ -3236,8 +3447,8 @@
 
 2010-04-28  Chong Yidong  <cyd@stupidchicken.com>
 
-        * progmodes/bug-reference.el (bug-reference-url-format): Revert
-        2010-04-27 change due to security risk.
+        * progmodes/bug-reference.el (bug-reference-url-format):
+        Revert 2010-04-27 change due to security risk.
 
 2010-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -3412,8 +3623,7 @@
 
         * ido.el (ido-init-completion-maps): For ido-switch-buffer, C-o
         toggles the use of virtual buffers.
-        (ido-buffer-internal): Guard `ido-use-virtual-buffers' global
-        value.
+        (ido-buffer-internal): Guard `ido-use-virtual-buffers' global value.
         (ido-toggle-virtual-buffers): New function.
 
 2010-04-21  Juanma Barranquero  <lekktu@gmail.com>
@@ -3990,7 +4200,7 @@
 
         Enable recentf-mode if using virtual buffers.
         * ido.el (recentf-list): Declare for byte-compiler.
-        (ido-virtual-buffers): Move up to silence byte-compiler.  Add docstring.
+        (ido-virtual-buffers): Move up to silence byte-compiler. Add docstring.
         (ido-make-buffer-list): Simplify.
         (ido-add-virtual-buffers-to-list): Simplify.  Enable recentf-mode.
 
@@ -5501,8 +5711,8 @@
 2010-01-21  Alan Mackenzie  <acm@muc.de>
 
         Fix a situation where deletion of a cpp construct throws an error.
-        * progmodes/cc-engine.el (c-invalidate-state-cache): Before
-        invoking c-with-all-but-one-cpps-commented-out, check that the
+        * progmodes/cc-engine.el (c-invalidate-state-cache):
+        Before invoking c-with-all-but-one-cpps-commented-out, check that the
         special cpp construct is still in the buffer.
         (c-parse-state): Record the special cpp with markers, not numbers.
 
@@ -6229,7 +6439,7 @@
 
         * ps-print.el (ps-face-attributes): It was not returning the
         attribute face for faces specified as string.  Reported by harven
-        <harven@free.fr>.
+        <harven@free.fr>.  (Bug#5254)
         (ps-print-version): New version 7.3.5.
 
 2009-12-18  Ulf Jasper  <ulf.jasper@web.de>