From: Glenn Morris Date: Thu, 27 Dec 2012 08:21:08 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu X-Git-Tag: emacs-24.3.90~173^2~7^2~477 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82e2a1f054cc0306494d1194036af4c5d7301caf;p=emacs.git Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu --- 82e2a1f054cc0306494d1194036af4c5d7301caf diff --cc ChangeLog index dbce562664e,d6a54782ecc..1a68ed5e954 --- a/ChangeLog +++ b/ChangeLog @@@ -1,18 -1,9 +1,23 @@@ -2012-12-24 Andreas Schwab ++2012-12-27 Andreas Schwab + + * configure.ac (SIGNALS_VIA_CHARACTERS): Also define for darwin. + (Bug#13222) + -2012-12-20 Akinori MUSHA (tiny change) +2012-12-26 Paul Eggert + + Revert static checking of stack smashing. + * configure.ac (WARN_CFLAGS): Omit -Wstack-protector when + configured with --enable-gcc-warnings. -Wstack-protector causes + diagnostics to be issued on Ubuntu 12.10 x86-64. + +2012-12-24 Paul Eggert + + Merge from gnulib, incorporating: + 2012-12-21 AC_PROG_MKDIR_P: port workaround to pre-2.62 Autoconf + 2012-12-20 AC_PROG_MKDIR_P: don't workaround if not buggy + 2012-12-17 filemode, sys_stat: Handle MPX files a la AIX. + +2012-12-21 Akinori MUSHA (tiny change) * Makefile.in (install-arch-dep): Ignore chmod errors. (Bug#13233) diff --cc doc/misc/ChangeLog index 9b58992d2d9,383833c1dc9..ce556568c56 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,23 -1,28 +1,48 @@@ -2012-12-22 Glenn Morris ++2012-12-27 Glenn Morris + + * viper.texi (Rudimentary Changes, Key Bindings, Key Bindings): + Avoid some overfull lines. + + * widget.texi (Programming Example): Break some long lines. + + * wisent.texi (Wisent Overview): Fix xref. + (Grammar format, Understanding the automaton): Avoid overfill. + + * bovine.texi (Optional Lambda Expression): Allow line break. + + * auth.texi (Help for users): Break long lines. + + * ada-mode.texi (Project file variables): + Reword to reduce underfull hbox. + (No project files, Use GNAT project file): + Use smallexample to make some overfull lines less terrible. + + * autotype.texi, bovine.texi, ede.texi, eieio.texi, pcl-cvs.texi: + Fix cross-references to separate manuals. + + * Makefile.in (gfdl): New variable. Use throughout where + appropriate so that targets depend on doclicense.texi. + +2012-12-25 Lars Ingebrigtsen + + * gnus.texi (Customizing the IMAP Connection): Mention the other + authenticators. + +2012-12-24 Lars Ingebrigtsen + + * gnus.texi (Browse Foreign Server): Document + `gnus-browse-delete-group'. + +2012-12-22 Glenn Morris + + * ada-mode.texi, ebrowse.texi, ediff.texi, ert.texi, eshell.texi: + * eudc.texi, idlwave.texi, pcl-cvs.texi, rcirc.texi, reftex.texi: + * remember.texi, ses.texi, speedbar.texi, vip.texi, viper.texi: + * widget.texi, wisent.texi: Nuke hand-written node pointers. + + * Makefile.in (gfdl): New variable. Use throughout where + appropriate so that targets depend on doclicense.texi. + 2012-12-22 Eli Zaretskii * makefile.w32-in ($(INFO_TARGETS), $(DVI_TARGETS)): Depend on diff --cc lisp/ChangeLog index 03122ff5000,f7664b663ac..f058c8632b7 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,52 -1,19 +1,66 @@@ -2012-12-26 Dmitry Gutov ++2012-12-27 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class", + "module" and "def" to have indentation before them. Regression + from 109911 (see the new test). + -2012-12-24 Dmitry Gutov - + * progmodes/ruby-mode.el: Bump the version to 1.2 (Bug#13200). + -2012-12-23 Alan Mackenzie ++2012-12-27 Alan Mackenzie + + Speed up fontification where there's large brace blocks. + * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): Add a limit + to a call of c-beginning-of-decl-1. + +2012-12-27 Vitalie Spinu (tiny change) + + * comint.el (comint-adjust-window-point): New function. + (comint-postoutput-scroll-to-bottom): Call + comint-adjust-window-point (Bug#13248). + +2012-12-26 Dmitry Gutov + + * progmodes/ruby-mode.el (auto-mode-alist): `purecopy' the + Rakefile regexp. + (auto-mode-alist): Associate .gemspec files with ruby-mode + (https://bugs.ruby-lang.org/issues/5453). + +2012-12-26 Jürgen Hötzel + + * net/tramp-adb.el (tramp-adb-get-ls-command): New defun. Suppress + coloring, if possible (required for BusyBox based systems like + CynagenMod). + (tramp-adb-handle-file-attributes) + (tramp-adb-handle-insert-directory) + (tramp-adb-handle-file-name-all-completions): Use it. + (tramp-adb-get-toolbox): New defun. Check for remote shell + implementation (BusyBox or Toolbox). + +2012-12-24 Constantin Kulikov (tiny change) + + * startup.el (initial-buffer-choice): Allow function as value + (Bug#13251). + (command-line-1): Handle case where initial-buffer-choice + specifies a function. + * server.el (server-execute): Handle case where + initial-buffer-choice specifies a function. + +2012-12-24 Lars Ingebrigtsen + + * mail/smtpmail.el (smtpmail-try-auth-method): Refactored out into + its own function. + (smtpmail-try-auth-methods): Forget the user name/password if the + login is unsuccessful (bug#12424). + +2012-12-22 Michael Albinus + + * notifications.el (notifications-notify): Protect body with + `with-demoted-errors'. + + * net/tramp-adb.el (tramp-adb-maybe-open-connection): Check + properties of remote device. Restart connection, if there is a + change. + 2012-12-21 Chong Yidong * sort.el (sort-subr): Doc fix (Bug#13056). diff --cc lisp/gnus/ChangeLog index d95c9cdee30,1ece8bf9107..a830088f3b6 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@@ -1,228 -1,18 +1,240 @@@ + 2012-12-27 Glenn Morris + + * plstore.el (plstore-passphrase-callback-function): - Fix file/buffer typo. (Bug#13264) ++ Use plstore-get-file. + -2012-12-24 Andreas Schwab ++2012-12-27 Andreas Schwab + - * nnimap.el (nnimap-find-article-by-message-id): Don't error out if - group is nil. - -2012-12-23 Andreas Schwab ++ * nnimap.el (nnimap-find-article-by-message-id): ++ Don't error out if group is nil. + + * shr.el (shr-tag-em): Render as italic, not bold. + -2012-12-02 Andreas Schwab +2012-12-26 Katsumi Yamaoka + + * mml2015.el (mml2015-epg-key-image): Use mm-set-buffer-multibyte. + +2012-12-25 Adam Sjøgren + + * mml2015.el (mml2015-epg-key-image): use --attribute-fd rather than + temporary file to get PGP key image. Pass no-show-photos when extracting + image to avoid having it pop up twice. + +2012-12-26 Lars Ingebrigtsen + + * gnus-art.el (gnus-article-treat-types): Include text/html as parts + eligible for treatment. + + * gnus-util.el (gnus-goto-colon): Move to the beginning of the visual + lines. This makes summary commands with hidden threads work more + reliably. + + * gnus-cite.el (gnus-article-hide-citation-maybe): Leave an expansion + button to mark the hidden citations (bug#9395). + +2012-12-26 Daiki Ueno + + * mml2015.el (mml2015-epg-signature-to-string): New function. + (mml2015-epg-verify-result-to-string): New function. + (mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-verify) + (mml2015-epg-clear-verify): Use mml2015-epg-verify-result-to-string + instead of epg-verify-result-to-string. + (epg-signature-key-id, epg-signature-to-string): Autoload. + (epg-verify-result-to-string): Remove autoload. + +2012-12-25 Adam Sjøgren + + * mml2015.el (mml2015-epg-key-image): New function, to retrieve photo + ID image from GPG public key. + (mml2015-epg-key-image-to-string): New function. + +2012-12-25 Leo Liu + + * plstore.el (plstore-passphrase-callback-function): Fix error when + error when plstore-cache-passphrase-for-symmetric-encryption is set + (bug#13264). + +2012-12-25 Lars Ingebrigtsen + + * gnus-sum.el (gnus-set-global-variables): Don't copy over the summary + buffer to the article buffer here, because that clobbers multiple + article buffers. + + * gnus-art.el (gnus-article-setup-buffer): Make sure that the article + buffer always points to the right summary buffer. + +2012-12-25 John Wiegley + + * auth-source.el (auth-source-netrc-parse): Allow using "password" as + the password (bug#12097). + +2012-12-25 Lars Ingebrigtsen + + * shr.el (shr-tag-a): Don't tagify elements that don't have HREFs + (bug#13263). + + * gnus-salt.el (gnus-highlight-selected-tree): Check whether the Tree + buffer exists before using it (bug#12475). + + * gnus-agent.el (gnus-agent-fetch-articles): Don't fetch articles from + offline groups (bug#11937). + + * message.el (message-yank-original): When using customize to set the + value of `message-cite-style', the variable it set to a symbol that's + the name of the variable, which must then be dereferenced (bug#12616). + +2012-12-25 Wolfgang Jenkner + + * lisp/gnus-spec.el (gnus-face-face-function): Initialize the value of + the `face' property with a list whose car is the face specified in the + format string and whose cdr is (nil). + * lisp/gnus-util.el + (gnus-put-text-property-excluding-characters-with-faces): Change + accordingly. + (gnus-get-text-property-excluding-characters-with-faces): New function. + * lisp/gnus-sum.el (gnus-summary-highlight-line): + * lisp/gnus-salt.el (gnus-tree-highlight-node): + * lisp/gnus-group.el (gnus-group-highlight-line): Use it. + +2012-12-25 Lars Ingebrigtsen + + * nnimap.el (nnimap-authenticator): Expand to allow specifying the + login methods. + (nnimap-login): Respect the `nnimap-authenticator' variable. + + * gnus-sum.el (gnus-summary-push-marks-to-backend): Push the complete + mark state when moving articles. Otherwise unticked articles will get + their ticks back after moving. + +2012-12-24 Lars Ingebrigtsen + + * gnus-srvr.el (gnus-browse-delete-group): Fix syntax error. + + * message.el (message-ignored-news-headers): Always remove + X-Message-SMTP-Method to avoid information leakage if the user + mistakenly inserts the header into news messages. + + * gnus-srvr.el (gnus-browse-delete-group): New command and keystroke. + + * gnus-sum.el (gnus-summary-hide-thread): If point were further to the + right than four characters, this command would move point to + `point-max'. Don't do that. + + * gnus-group.el (gnus-group-read-ephemeral-group): Set the active data + to nil to allow re-selecting groups that gain articles. + (gnus-bug-group-download-format-alist): Update the URL. + +2012-12-23 Andreas Schwab + + * shr.el (shr-tag-em): Render em as italic, not bold. + +2012-12-23 Lars Ingebrigtsen + + * gnus-int.el (gnus-backend-trace): Factor out into its own function + for reuse. + (gnus-open-server): Use it to add more tracing. + (gnus-finish-retrieve-group-infos): Add backend tracing. + (gnus-backend-trace): Also note the elapsed seconds. + +2012-12-22 Philipp Haselwarter + + * gnus-sync.el (gnus-sync-file-encrypt-to, gnus-sync-save): Set + epa-file-encrypt-to from variable to avoid querying. + +2012-12-14 Akinori MUSHA (tiny change) + + * sieve-mode.el (sieve-font-lock-keywords): + Keywords should be word delimited. (Bug#13173) + +2012-12-12 Katsumi Yamaoka + + * gnus-art.el (gnus-article-browse-html-parts): Use
+ instead of 
 to align message header.
 +
 +2012-12-12  Sam Steingold  
 +
 +	* gnus.el (gnus-other-frame-resume-function): Add user option.
 +	(gnus-other-frame): Call `gnus-other-frame-resume-function' on resume.
 +
 +2012-12-06  Sam Steingold  
 +
 +	* gnus-start.el (gnus-before-resume-hook): Add.
 +	(gnus-1): Run it when Gnus is alive.
 +
 +2012-12-06  Katsumi Yamaoka  
 +
 +	* gmm-utils.el (gmm-called-interactively-p): Restore as a macro.
 +	* gnus-art.el (article-unsplit-urls)
 +	* gnus-bookmark.el (gnus-bookmark-bmenu-list)
 +	* gnus-registry.el (gnus-registry-get-article-marks)
 +	* message.el (message-goto-body): Use it.
 +	(message-called-interactively-p): Remove.
 +
 +	* spam-stat.el (spam-stat-called-interactively-p): New macro.
 +	(spam-stat-score-buffer): Use it.
 +
 +	* spam.el: Silence the warnings against BBDB functions when compiling.
 +
 +	* gnus-score.el (gnus-score-decode-text-parts):
 +	Use append+mapcar instead of the cl function mapcan.
 +
 +	* gmm-utils.el (gmm-flet): Remove.
 +
 +	* gnus-sync.el (gnus-sync-lesync-call):
 +	Avoid overriding json-alist-p.
 +
 +	* message.el (message-read-from-minibuffer):
 +	Avoid overriding mail-abbrev-in-expansion-header-p.
 +
 +2012-12-05  Sam Steingold  
 +
 +	* gnus.el (gnus-delete-gnus-frame): Extract from `gnus-other-frame'.
 +	(gnus-other-frame): Add `gnus-delete-gnus-frame' to
 +	`gnus-suspend-gnus-hook' in addition to `gnus-exit-gnus-hook'.
 +
 +2012-12-05  Katsumi Yamaoka  
 +
 +	* gmm-utils.el (gmm-called-interactively-p): Revert.
 +	This seems to cause Emacs to get stuck!
 +	* gnus-art.el (article-unsplit-urls)
 +	* gnus-bookmark.el (gnus-bookmark-bmenu-list)
 +	* gnus-registry.el (gnus-registry-get-article-marks)
 +	* message.el (message-goto-body)
 +	(message-called-interactively-p): Revert.
 +
 +	* gmm-utils.el (gmm-called-interactively-p): New function.
 +	* gnus-art.el (article-unsplit-urls)
 +	* gnus-bookmark.el (gnus-bookmark-bmenu-list)
 +	* gnus-registry.el (gnus-registry-get-article-marks)
 +	* message.el (message-goto-body): Use it.
 +	(message-called-interactively-p): Remove.
 +
 +	* gmm-utils.el (gmm-flet): Restore it using cl-letf.
 +	* gnus-sync.el (gnus-sync-lesync-call)
 +	* message.el (message-read-from-minibuffer): Use it.
 +
 +2012-12-05  Katsumi Yamaoka  
 +
 +	* gmm-utils.el (gmm-flet): Remove.
 +	* gnus-sync.el (gnus-sync-lesync-call)
 +	* message.el (message-read-from-minibuffer): Don't use it.
 +
 +2012-12-04  Katsumi Yamaoka  
 +
 +	* gmm-utils.el (gmm-labels): Use cl-labels if available.
 +
 +2012-12-04  Katsumi Yamaoka  
 +
 +	* gmm-utils.el (gmm-flet, gmm-labels): New macros.
 +
 +	* gnus-sync.el (gnus-sync-lesync-call)
 +	* message.el (message-read-from-minibuffer): Use gmm-flet.
 +
 +	* gnus-score.el (gnus-score-decode-text-parts): Use gmm-labels.
 +
 +	* gnus-util.el (gnus-macroexpand-all): Remove.
 +
 +2012-12-03  Andreas Schwab  
  
  	* gnus-sum.el (gnus-summary-mode-map): Bind gnus-summary-widget-forward
  	to TAB, not [tab].
diff --cc src/ChangeLog
index d4794667ead,fccdc1dfcae..3fabe7579a9
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,88 -1,23 +1,108 @@@
+ 2012-12-27  Glenn Morris  
+ 
+ 	* cygw32.c (Fcygwin_convert_file_name_to_windows)
+ 	(Fcygwin_convert_file_name_from_windows): Doc fixes.
+ 
 -2012-12-24  Eli Zaretskii  
++2012-12-27  Eli Zaretskii  
+ 
+ 	* fileio.c (file_name_as_directory, directory_file_name): Accept
+ 	an additional argument MULTIBYTE to indicate whether the input C
+ 	came from a multibyte or a unibyte Lisp string; all callers
+ 	adjusted.  Don't assume the input string is always multibyte.
+ 	(Bug#13262)
+ 	(Ffile_name_directory) [DOS_NT]: Handle unibyte strings correctly:
+ 	don't ENCODE_FILE them, and return a unibyte string if the input
+ 	was unibyte.
+ 	(Fexpand_file_name): Don't mix unibyte with multibyte strings, and
+ 	don't assume the input strings will always be multibyte.  If the
+ 	input strings are multibyte, decode strings obtained from C
+ 	library functions.
+ 
 +2012-12-26  Dmitry Antipov  
 +
 +	* lisp.h (toplevel): Add two notices to the comment about
 +	defining a new Lisp data type.
 +	* print.c (print_object): If Lisp_Save_Value object's pointer
 +	is the address of a memory area containing Lisp_Objects, try
 +	to print them.
 +	* alloc.c (valid_lisp_object_p): Adjust comment.
 +
 +2012-12-26  Dmitry Antipov  
 +
 +	* keyboard.c (record_asynch_buffer_change): Initialize an event
 +	only if it's really needed.
 +	* frame.h (enum output_method): Remove output_mac member since
 +	it's a leftover from the deleted code.
 +	* frame.c (Fframep): Adjust user here ...
 +	* terminal.c (Fterminal_live_p): ... and here.
 +	* coding.c (Qmac): Now here because it's only used to denote
 +	end-of-line encoding type.
 +	(syms_of_coding): DEFSYM it.
 +	* frame.h (Qmac): Remove duplicated declaration.
 +
 +2012-12-26  Paul Eggert  
 +
 +	* window.c (select_window_1): Now static, since it's used only here.
 +
 +2012-12-25  Eli Zaretskii  
 +
 +	* window.c (window_body_cols): Subtract display margins from the
 +	window body width on TTYs as well.  See
 +	http://lists.gnu.org/archive/html/help-gnu-emacs/2012-12/msg00317.html
 +	for the original report.
 +
 +2012-12-25  Dmitry Antipov  
 +
 +	* xdisp.c (redisplay_window): Remove inner local variable
 +	because the outer shadowed one has the same meaning.
 +	* xterm.h (struct x_output): Remove toolbar_detached member since it's
 +	set but never used.
 +	* gtkutil.c (xg_tool_bar_detach_callback, xg_tool_bar_attach_callback)
 +	(xg_create_tool_bar): Adjust users.
 +
 +2012-12-24  Dmitry Antipov  
 +
 +	* buffer.h (BUF_COMPACT): New macro to follow the common style.
 +	* buffer.c (Fget_buffer_create): Use it to set compact field of
 +	struct buffer_text to avoid accessing an uninitialized value
 +	when compact_buffer is called for the first time.
 +	(compact_buffer): Use convenient BUF_COMPACT and BUF_MODIFF.
 +	(Fset_buffer_modified_p): Use buffer_window_count to check
 +	whether the buffer is displayed in some window.
 +	* xdisp.c (message_dolog): Likewise.
 +
 +2012-12-23  Eli Zaretskii  
 +
 +	* w32.c (acl_set_file): If setting the file security descriptor
 +	fails, and the new DACL is identical to the existing one, silently
 +	return success.  This fixes problems for users backing up their
 +	own files without having the necessary privileges for setting
 +	security descriptors.
 +
 +	* w32proc.c (reader_thread): Do not index fd_info[] with negative
 +	values.
 +	(reader_thread): Exit when cp->status becomes STATUS_READ_ERROR
 +	after WaitForSingleObject returns normally.  This expedites reader
 +	thread shutdown when delete_child triggers it.
 +	(reap_subprocess): More accurate commentary for why we call
 +	delete_child only when cp->fd is negative.
 +
 +	* w32.c (sys_close): Do not call delete_child on a subprocess
 +	whose handle is not yet closed.  Instead, set its file descriptor
 +	to a negative value, so that reap_subprocess will call
 +	delete_child on that subprocess when its SIGCHLD arrives.  This
 +	avoids closing handles used for communications between sys_select
 +	and reader_thread, which doesn't give sys_select a chance to
 +	notice that the process exited and invoke the SIGCHLD handler for
 +	it.
 +
 +2012-12-23  Jan Djärv  
 +
 +	* nsfns.m (Fns_do_applescript): Run event loop until script has
 +	been executed (Bug#12969).
 +	(ns_run_ascript): Chech as_script for nil, set to nil after
 +	executing script.
 +
  2012-12-22  Martin Rudalics  
  
  	* window.c (Fselect_window): Reword doc-string (Bug#13248).
diff --cc src/fileio.c
index 50fbaa7ff04,2d72583e506..9f70c790592
--- a/src/fileio.c
+++ b/src/fileio.c
@@@ -1165,10 -1203,17 +1209,17 @@@ filesystem tree, not (expand-file-name 
  	  if (drive)
  	    {
  	      if (!getdefdir (c_toupper (drive) - 'A' + 1, adir))
- 		newdir = "/";
+ 		strcpy (adir, "/");
  	    }
  	  else
 -	    getwd (adir);
 +	    getcwd (adir, MAXPATHLEN + 1);
+ 	  if (multibyte)
+ 	    {
+ 	      Lisp_Object tem = build_string (adir);
+ 
+ 	      tem = DECODE_FILE (tem);
+ 	      memcpy (adir, SSDATA (tem), SBYTES (tem) + 1);
+ 	    }
  	  newdir = adir;
  	}
  
diff --cc test/ChangeLog
index e7e7c755d02,7344d8dfb95..7d9b10ce787
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,59 -1,8 +1,64 @@@
 -2012-12-26  Dmitry Gutov  
++2012-12-27  Dmitry Gutov  
+ 
+ 	* automated/ruby-mode-tests.el
+ 	(ruby-indent-after-block-in-continued-expression): New test.
+ 
 +2012-12-14  Dmitry Gutov  
 +
 +	* automated/ruby-mode-tests.el
 +	Rename one interpolation test; add three more.
 +	(ruby-with-temp-buffer): New macro, use it where appropriate.
 +	(ruby-add-log-current-method-examples): Use "_" for target point.
 +	Add four new tests for ruby-add-log-current-method.
 +
 +2012-12-11  Glenn Morris  
 +
 +	* automated/f90.el (f90-test-bug13138): New test.
 +
 +2012-12-10  Rüdiger Sonderfeld  
 +
 +	* automated/inotify-test.el: New test.
 +
 +2012-12-02  Chong Yidong  
 +
 +	* automated/ruby-mode-tests.el
 +	(ruby-add-log-current-method-examples): Don't use loop macro, to
 +	allow automated testing to work.
 +
 +2012-11-20  Stefan Monnier  
 +
 +	* automated/advice-tests.el (advice-tests--data): Remove.
 +	(advice-tests): Move the tests directly here instead.
 +	Add called-interactively-p tests.
 +
 +2012-11-19  Stefan Monnier  
 +
 +	* automated/ert-x-tests.el: Use cl-lib.
 +	* automated/ert-tests.el: Use lexical-binding and cl-lib.
 +
 +2012-11-14  Dmitry Gutov  
 +
 +	* automated/ruby-mode-tests.el (ruby-indent-singleton-class): Pass.
 +	(ruby-indent-inside-heredoc-after-operator)
 +	(ruby-indent-inside-heredoc-after-space): New tests.
 +	Change direct font-lock face references to var references.
 +	(ruby-interpolation-suppresses-syntax-inside): New test.
 +	(ruby-interpolation-inside-percent-literal-with-paren):
 +	New failing test.
 +
 +2012-11-13  Dmitry Gutov  
 +
 +	* automated/ruby-mode-tests.el (ruby-heredoc-font-lock)
 +	(ruby-singleton-class-no-heredoc-font-lock)
 +	(ruby-add-log-current-method-examples): New tests.
 +	(ruby-test-string): Extract from ruby-should-indent-buffer.
 +	(ruby-deftest-move-to-block): New macro.
 +	Add several move-to-block tests.
 +
 +2012-11-12  Stefan Monnier  
 +
 +	* automated/advice-tests.el: New tests.
 +
  2012-10-14  Eli Zaretskii  
  
  	* automated/compile-tests.el (compile-tests--test-regexps-data):
diff --cc test/automated/ruby-mode-tests.el
index 1f0c0ab6f9e,28c2a2a070d..51c28e667fd
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@@ -224,9 -202,24 +224,22 @@@ VALUES-PLIST is a list with alternatin
     |  end
     |"))
  
+ (ert-deftest ruby-indent-after-block-in-continued-expression ()
+   (ruby-should-indent-buffer
+    "var =
+    |  begin
+    |    val
+    |  end
+    |statement"
+    "var =
+    |begin
+    |val
+    |end
+    |statement"))
+ 
  (ert-deftest ruby-move-to-block-stops-at-indentation ()
 -  (with-temp-buffer
 -    (insert "def f\nend")
 +  (ruby-with-temp-buffer "def f\nend"
      (beginning-of-line)
 -    (ruby-mode)
      (ruby-move-to-block -1)
      (should (looking-at "^def"))))