Commit 41e96298 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org

parents 303fd941 bd673cc5
2014-11-03 Glenn Morris <rgm@gnu.org>
* programs.texi (Misc for Programs): Fix typo.
2014-10-30 Eli Zaretskii <eliz@gnu.org>
* frames.texi (Scroll Bars): Improve indexing of faces.
......
......@@ -1453,7 +1453,7 @@ creates.
@findex superword-mode
Superword mode is a buffer-local minor mode that causes editing and
motion commands to treat symbols (e.g., @samp{this_is_a_symbol}) as words.
When Subword mode is enabled, the minor mode indicator
When Superword mode is enabled, the minor mode indicator
@iftex
@samp{@math{^2}}
@end iftex
......
......@@ -38,7 +38,10 @@ don't take "&rest args" any more.
*** cc-compat.el
---
*** crisp.el, tpu-edt.el, ws-mode.el
*** crisp.el - moved to elpa.gnu.org.
---
*** tpu-edt.el, ws-mode.el
These emulations of old editors are believed to be no longer relevant
- contact emacs-devel@gnu.org if you disagree.
......
2014-11-03 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Use a
local copy of FILENAME, when it is remote. (Bug#18751)
* net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise
an error when the command fails; the return code must indicate.
(tramp-adb-send-command-and-check): Fix docstring.
2014-11-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
 
* net/eww.el (eww-display-html): Clear `url-queue'.
......
......@@ -794,11 +794,13 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
;; directory.
(condition-case nil
(progn
(setq ret 0)
(tramp-adb-barf-unless-okay
v (format "(cd %s; %s)"
(tramp-shell-quote-argument localname) command)
"")
(setq ret
(if (tramp-adb-send-command-and-check
v
(format "(cd %s; %s)"
(tramp-shell-quote-argument localname) command))
;; Set return status accordingly.
0 1))
;; We should add the output anyway.
(when outbuf
(with-current-buffer outbuf
......@@ -1031,8 +1033,9 @@ This happens for Android >= 4.0."
(defun tramp-adb-send-command-and-check
(vec command)
"Run COMMAND and check its exit status.
Sends `echo $?' along with the COMMAND for checking the exit status. If
COMMAND is nil, just sends `echo $?'. Returns the exit status found."
Sends `echo $?' along with the COMMAND for checking the exit
status. If COMMAND is nil, just sends `echo $?'. Returns nil if
the exit status is not equal 0, and t otherwise."
(tramp-adb-send-command
vec (if command
(format "%s; echo tramp_exit_status $?" command)
......
......@@ -2061,11 +2061,15 @@ FILENAME is the source file, NEWNAME the target file.
KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
(with-temp-buffer
;; We must disable multibyte, because binary data shall not be
;; converted.
;; converted. `insert-file-contents-literally' does not support
;; file name handlers for GNU Emacs; we must create a local copy
;; therefore.
(set-buffer-multibyte nil)
(let ((coding-system-for-read 'binary)
(jka-compr-inhibit t))
(insert-file-contents-literally filename))
(jka-compr-inhibit t)
(tmpfile (file-local-copy filename)))
(insert-file-contents-literally (or tmpfile filename))
(when tmpfile (delete-file tmpfile)))
;; We don't want the target file to be compressed, so we let-bind
;; `jka-compr-inhibit' to t.
(let ((coding-system-for-write 'binary)
......
......@@ -23,6 +23,8 @@
;;; Commentary:
;; *Note: This package has now moved to elpa.gnu.org.*
;; Keybindings and minor functions to duplicate the functionality and
;; finger-feel of the CRiSP/Brief editor. This package is designed to
;; facilitate transitioning from Brief to (XE|E)macs with a minimum
......
2014-11-03 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix.
(Fdump_frame_glyph_matrix): Don't segfault if invoked on a GUI
frame; instead, print an error message.
2014-11-03 Jan Djärv <jan.h.d@swipnet.se>
* nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925).
2014-11-02 Jan Djärv <jan.h.d@swipnet.se>
 
* nsimage.m (allocInitFromFile:): Initialize bmRep.
......
......@@ -639,8 +639,12 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
{
BOOL edited = NO;
struct frame *f = XFRAME (frame);
struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
NSView *view = FRAME_NS_VIEW (f);
struct window *w;
NSView *view;
if (! FRAME_NS_P (f)) continue;
w = XWINDOW (FRAME_SELECTED_WINDOW (f));
view = FRAME_NS_VIEW (f);
if (!MINI_WINDOW_P (w))
edited = ! NILP (Fbuffer_modified_p (w->contents)) &&
! NILP (Fbuffer_file_name (w->contents));
......
......@@ -4930,8 +4930,8 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, int noerror)
/* The function move_iterator_vertically may move over more than
the specified y-distance. If it->w is small, e.g. a
mini-buffer window, we may end up in front of the window's
display area. This is the case when Start displaying at the
start of the line containing PT in this case. */
display area. Start displaying at the start of the line
containing PT in this case. */
if (it.current_y <= 0)
{
init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
......
......@@ -18803,7 +18803,10 @@ DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix,
doc: /* Dump the current matrix of the selected window to stderr.
Shows contents of glyph row structures. With non-nil
parameter GLYPHS, dump glyphs as well. If GLYPHS is 1 show
glyphs in short form, otherwise show glyphs in long form. */)
glyphs in short form, otherwise show glyphs in long form.
Interactively, no argument means show glyphs in short form;
with numeric argument, its value is passed as the GLYPHS flag. */)
(Lisp_Object glyphs)
{
struct window *w = XWINDOW (selected_window);
......@@ -18821,11 +18824,16 @@ glyphs in short form, otherwise show glyphs in long form. */)
 
 
DEFUN ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix,
Sdump_frame_glyph_matrix, 0, 0, "", doc: /* */)
Sdump_frame_glyph_matrix, 0, 0, "", doc: /* Dump the current glyph matrix of the selected frame to stderr.
Only text-mode frames have frame glyph matrices. */)
(void)
{
struct frame *f = XFRAME (selected_frame);
dump_glyph_matrix (f->current_matrix, 1);
if (f->current_matrix)
dump_glyph_matrix (f->current_matrix, 1);
else
fprintf (stderr, "*** This frame doesn't have a frame glyph matrix ***\n");
return Qnil;
}
 
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment