mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from trunk

Browse source
This commit is contained in:
Stefan Monnier 2011-03-21 12:42:16 -04:00
commit cafdcef32d
250 changed files with 7207 additions and 3869 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/simple.el
View file

@ -636,7 +636,9 @@ If the region is active, only delete whitespace within the region."
(if (looking-at ".*\f")
(goto-char (match-end 0))))
(delete-region (point) (match-end 0)))
(set-marker end-marker nil)))))
(set-marker end-marker nil))))
;; Return nil for the benefit of `write-file-functions'.
nil)
(defun newline-and-indent ()
"Insert a newline, then indent according to major mode.
@ -2627,7 +2629,7 @@ specifies the value of ERROR-BUFFER."
(with-output-to-string
(with-current-buffer
standard-output
(call-process shell-file-name nil t nil shell-command-switch command))))
(process-file shell-file-name nil t nil shell-command-switch command))))
(defun process-file (program &optional infile buffer display &rest args)
"Process files synchronously in a separate process.