Mercurial > emacs

changeset 109794:a8075662572b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 23:59:58 +0000
parents b60dcdd855f0 (current diff) 028db67bd5dd (diff)
children 1e3bc66493cd
files
diffstat 3 files changed, 23 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Aug 08 22:52:25 2010 +0000
+++ b/lisp/ChangeLog	Sun Aug 08 23:59:58 2010 +0000
@@ -1,5 +1,8 @@
 2010-08-08  Chong Yidong  <cyd@stupidchicken.com>
 
+	* tutorial.el (tutorial--default-keys): C-d is now bound to
+	delete-forward-char (Bug#6826).
+
 	* mouse.el (mouse-drag-track): Remove accidentally-removed check
 	for `double' value of mouse-1-click-follows-link (Bug#6807).
 
@@ -15,14 +18,11 @@
 
 2010-08-08  Kenichi Handa  <handa@m17n.org>
 
-	* international/mule.el (define-charset): Store NAME as :base
-	property.
-	(ctext-non-standard-encodings-table): Pay attention to charset
-	aliases.
+	* international/mule.el (define-charset): Store NAME as :base property.
+	(ctext-non-standard-encodings-table): Pay attention to charset aliases.
 	(ctext-pre-write-conversion): Sort ctext-standard-encodings by the
 	current priority.  Force using the designation of the specific
-	charset by adding `charset' text property.  Improve the whole
-	algorithm.
+	charset by adding `charset' text property.  Improve the whole algorithm.
 
 2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -35,8 +35,8 @@
 	* language/cyrillic.el: Don't add "microsoft-cp1251" to
 	ctext-non-standard-encodings-alist here.
 
-	* international/mule.el (ctext-non-standard-encodings-alist): Add
-	"koi8-r" and "microsoft-cp1251".
+	* international/mule.el (ctext-non-standard-encodings-alist):
+	Add "koi8-r" and "microsoft-cp1251".
 	(ctext-standard-encodings): New variable.
 	(ctext-non-standard-encodings-table): List only elements for
 	non-standard encodings.
@@ -51,7 +51,7 @@
 
 	* simple.el (exchange-dot-and-mark): Mark obsolete, finally.
 
-2010-08-03  Juanma Barranquero  <lekktu@gmail.com>
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
 
 	* progmodes/which-func.el (which-func-format): Split help-echo text
 	into lines, like other mode-line tooltips.
@@ -59,26 +59,26 @@
 	* server.el (server-start): When using TCP sockets, force IPv4
 	and use a literal 127.0.0.1 for localhost.  (Related to bug#6781.)
 
-2010-08-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+2010-08-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* bindings.el (complete-symbol): Run completion-at-point as a fallback.
 
-2010-08-02  Juanma Barranquero  <lekktu@gmail.com>
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
 
 	* term.el (term-delimiter-argument-list): Reflow docstring.
 	(term-read-input-ring, term-write-input-ring, term-send-input)
 	(term-bol, term-erase-in-display, serial-supported-or-barf):
 	Fix typos in docstrings.
 
-2010-08-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+2010-08-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* bindings.el (function-key-map): Add a S-tab => backtab fallback.
 
-2010-08-01  Juanma Barranquero  <lekktu@gmail.com>
+2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
 
 	* dabbrev.el (dabbrev-completion): Fix typo in docstring.
 
-2010-08-01  MON KEY  <monkey@sandpframing.com>  (tiny change)
+2010-08-08  MON KEY  <monkey@sandpframing.com>  (tiny change)
 
 	* emacs-lisp/syntax.el (syntax-ppss-toplevel-pos):
 	Fix typo in docstring (bug#6747).
@@ -119,9 +119,9 @@
 
 2010-08-07  Michael R. Mauger  <mmaug@yahoo.com>
 
-	* progmodes/sql.el (sql-mode-sqlite-font-lock-keywords): Added
-	SQLite 3 keywords, functions and datatypes.
-	(sql-interactive-mode): Removed `comint-process-echoes' set to t
+	* progmodes/sql.el (sql-mode-sqlite-font-lock-keywords):
+	Add SQLite 3 keywords, functions and datatypes.
+	(sql-interactive-mode): Remove `comint-process-echoes' set to t
 	(Bug#6686).
 
 2010-08-07  Chong Yidong  <cyd@stupidchicken.com>
@@ -154,7 +154,7 @@
 
 2010-08-06  Michael Albinus  <michael.albinus@gmx.de>
 
-	* net/tramp.el (tramp-handle-start-file-process ): Set connection
+	* net/tramp.el (tramp-handle-start-file-process): Set connection
 	property "vec".
 	(tramp-process-sentinel): Use it for flushing the cache.  We
 	cannot do it via the process buffer, the buffer could be deleted
--- a/lisp/tutorial.el	Sun Aug 08 22:52:25 2010 +0000
+++ b/lisp/tutorial.el	Sun Aug 08 23:59:58 2010 +0000
@@ -252,7 +252,7 @@
              ;; * INSERTING AND DELETING
              ;; C-u 8 * to insert ********.
              (delete-backward-char "\d")
-             (delete-char [?\C-d])
+             (delete-forward-char [?\C-d])
              (backward-kill-word [?\M-\d])
              (kill-word [?\M-d])
              (kill-line [?\C-k])
--- a/src/ChangeLog	Sun Aug 08 22:52:25 2010 +0000
+++ b/src/ChangeLog	Sun Aug 08 23:59:58 2010 +0000
@@ -90,10 +90,8 @@
 	* xselect.c (QPRIMARY): Move to keyboard.c.
 
 	* keyboard.c (Vselect_active_regions): Move from simple.el.
-	(Vsaved_region_selection, Qx_set_selection, QPRIMARY, Qlazy): New
-	vars.
-	(command_loop_1): Set window selection prior to deactivating the
-	mark.
+	(Vsaved_region_selection, Qx_set_selection, QPRIMARY, Qlazy): New vars.
+	(command_loop_1): Set window selection prior to deactivating the mark.
 
 2010-08-07  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -113,8 +111,8 @@
 
 	* keyboard.h (quit_char): Add declaration.
 	* process.h (QCport, QCspeed, QCprocess, QCbytesize, QCstopbits)
-	(QCparity, Qodd, Qeven, QCflowcontrol, Qhw, Qsw, QCsummary): Add
-	declarations.
+	(QCparity, Qodd, Qeven, QCflowcontrol, Qhw, Qsw, QCsummary):
+	Add declarations.
 	* sysdep.c:
 	* w32.c: Remove the above declarations.