]> git.eshelyaron.com Git - emacs.git/log
emacs.git
11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 08:27:49 +0000 (10:27 +0200)]
merge from trunk

11 years agoAdvertise using `kill-new' and `kill-append' in Lisp programs.
Xue Fuqiao [Fri, 16 Aug 2013 08:11:44 +0000 (16:11 +0800)]
Advertise using `kill-new' and `kill-append' in Lisp programs.

* lisp/simple.el (copy-region-as-kill, kill-ring-save): Advertise using
`kill-new' and `kill-append' in Lisp programs.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 07:30:16 +0000 (09:30 +0200)]
merge from trunk

11 years ago* net/ange-ftp.el (ange-ftp-skip-msgs): Bump :version.
Glenn Morris [Fri, 16 Aug 2013 07:18:17 +0000 (00:18 -0700)]
* net/ange-ftp.el (ange-ftp-skip-msgs): Bump :version.

11 years ago* net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV (tiny change)
William Parsons [Fri, 16 Aug 2013 07:17:33 +0000 (00:17 -0700)]
* net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV (tiny change)

Fixes: debbugs:1972
11 years ago* lisp/net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):
Glenn Morris [Fri, 16 Aug 2013 07:13:48 +0000 (00:13 -0700)]
* lisp/net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):
Handle "Remote Directory" response of some clients.

Fixes: debbugs:15058
11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 07:07:17 +0000 (09:07 +0200)]
merge from trunk

11 years ago* bytecomp.el (byte-compile-make-variable-buffer-local): Tweak warning.
Glenn Morris [Fri, 16 Aug 2013 06:53:41 +0000 (23:53 -0700)]
* bytecomp.el (byte-compile-make-variable-buffer-local): Tweak warning.

Fixes: debbugs:14926
11 years agoSimplify news and mail menu items
Glenn Morris [Fri, 16 Aug 2013 06:50:58 +0000 (23:50 -0700)]
Simplify news and mail menu items

* lisp/menu-bar.el (send-mail-item-name, read-mail-item-name): Remove.
(menu-bar-tools-menu): Simplify news and mail items.

Fixes: debbugs:15095
11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 06:46:48 +0000 (08:46 +0200)]
merge from trunk

11 years agoAdd functions to change the speed of animated images
Glenn Morris [Fri, 16 Aug 2013 06:33:08 +0000 (23:33 -0700)]
Add functions to change the speed of animated images

* lisp/image-mode.el (image-mode-map): Add menu items to reverse,
increase, decrease, reset animation speed.
(image--set-speed, image-increase-speed, image-decrease-speed)
(image-reverse-speed, image-reset-speed): New functions.
(image-mode-map): Add bindings for speed commands.

* lisp/image.el (image-animate-get-speed, image-animate-set-speed):
New functions.
(image-animate-timeout): Respect image :speed property.

* etc/NEWS: Mention this.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 06:16:39 +0000 (08:16 +0200)]
merge from trunk

11 years agodoc/lispref/text.texi(Margins): Add an index.
Xue Fuqiao [Fri, 16 Aug 2013 06:03:18 +0000 (14:03 +0800)]
doc/lispref/text.texi(Margins): Add an index.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 05:26:31 +0000 (07:26 +0200)]
merge from trunk

11 years agoSpelling fixes.
Paul Eggert [Fri, 16 Aug 2013 05:15:51 +0000 (22:15 -0700)]
Spelling fixes.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 03:31:20 +0000 (05:31 +0200)]
merge from trunk

11 years agoRefine the documentation of `insert-buffer-substring'.
Xue Fuqiao [Fri, 16 Aug 2013 03:16:03 +0000 (11:16 +0800)]
Refine the documentation of `insert-buffer-substring'.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 02:11:12 +0000 (04:11 +0200)]
merge from trunk

11 years ago* src/editfns.c (insert_before_markers): Mention overlay in the doc string.
Xue Fuqiao [Fri, 16 Aug 2013 02:09:08 +0000 (10:09 +0800)]
* src/editfns.c (insert_before_markers): Mention overlay in the doc string.

11 years ago* doc/lispref/text.texi (Insertion): Add cross-references.
Xue Fuqiao [Fri, 16 Aug 2013 01:57:58 +0000 (09:57 +0800)]
* doc/lispref/text.texi (Insertion): Add cross-references.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 00:31:27 +0000 (02:31 +0200)]
merge from trunk

11 years agoRemove documentation of undefined behavior.
Xue Fuqiao [Fri, 16 Aug 2013 00:20:56 +0000 (08:20 +0800)]
Remove documentation of undefined behavior.

* doc/lispref/positions.texi (Character Motion):
* doc/lispref/markers.texi (Moving Markers):
(Creating Markers): Comment out undefined behavior.

* src/marker.c (set_marker): Remove documentation of undefined behavior.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 20:21:38 +0000 (22:21 +0200)]
merge from trunk

11 years agoAdd comment.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 20:17:35 +0000 (22:17 +0200)]
Add comment.

11 years agoWhitespace fixup.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 20:10:47 +0000 (22:10 +0200)]
Whitespace fixup.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 20:01:31 +0000 (22:01 +0200)]
merge from trunk

11 years ago(imagemagick_compute_animated_image): Allow certain degenerate images
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 19:46:02 +0000 (21:46 +0200)]
(imagemagick_compute_animated_image): Allow certain degenerate images

(imagemagick_compute_animated_image): Allow images that say they
have sub-images that are bigger than the main image, but just crop
them.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 19:01:43 +0000 (21:01 +0200)]
merge from trunk

11 years ago(imagemagick_compute_animated_image): Fix animated segafault
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 18:47:28 +0000 (20:47 +0200)]
(imagemagick_compute_animated_image): Fix animated segafault

(imagemagick_compute_animated_image): Setting the iterator row to
zero is apparently not allowed.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 18:46:44 +0000 (20:46 +0200)]
merge from trunk

11 years agoimage.c animation touchups
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 18:34:23 +0000 (20:34 +0200)]
image.c animation touchups

* image.c (imagemagick_compute_animated_image): Animate correctly
when sub-images are smaller than the main image.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 17:42:36 +0000 (19:42 +0200)]
merge from trunk

11 years ago* nsmenu.m (menuWillOpen:): Fix preprocessor test.
Jan Djärv [Thu, 15 Aug 2013 17:36:45 +0000 (19:36 +0200)]
* nsmenu.m (menuWillOpen:): Fix preprocessor test.

Fixes: debbugs:15001
11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 17:32:02 +0000 (19:32 +0200)]
merge from trunk

11 years ago(imagemagick_compute_animated_image): Clean up code slightly
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 17:26:34 +0000 (19:26 +0200)]
(imagemagick_compute_animated_image): Clean up code slightly

11 years ago* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Put point on the
Stefan Monnier [Thu, 15 Aug 2013 17:21:19 +0000 (13:21 -0400)]
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Put point on the
previous line.
(debugger-eval-expression, debugger-record-expression):
Use read--expression (bug#15102).

Fixes: debbugs:15101
11 years ago(imagemagick_compute_animated_image): Respect the GIF disposal methods.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 17:20:06 +0000 (19:20 +0200)]
(imagemagick_compute_animated_image): Respect the GIF disposal methods.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 17:16:52 +0000 (19:16 +0200)]
merge from trunk

11 years agoDeclare external variables.
Michael Albinus [Thu, 15 Aug 2013 17:02:09 +0000 (19:02 +0200)]
Declare external variables.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 16:41:51 +0000 (18:41 +0200)]
merge from trunk

11 years agoRevert last change to gmalloc.c; update some comments.
Ken Brown [Thu, 15 Aug 2013 16:37:15 +0000 (12:37 -0400)]
Revert last change to gmalloc.c; update some comments.

11 years agoFix minor problems found by static checking.
Paul Eggert [Thu, 15 Aug 2013 16:28:42 +0000 (09:28 -0700)]
Fix minor problems found by static checking.

* frame.c (delete_frame):
* xdisp.c (next_element_from_display_vector):
Avoid uninitialized local.
* image.c (imagemagick_compute_animated_image): Port to C89.
Prefer usual GNU indentation style for loops.
Be more careful about bizarrely large sizes, by using ptrdiff_t
instead of int.

11 years agoFurther image.c compilation warning fixes
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 16:03:56 +0000 (18:03 +0200)]
Further image.c compilation warning fixes

11 years ago(imagemagick_compute_animated_image): Implement a simple cache
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 16:01:13 +0000 (18:01 +0200)]
(imagemagick_compute_animated_image): Implement a simple cache

(imagemagick_compute_animated_image): Fix some compilation
warnings.  Implement a very simple cache to make the animation
usable at all, but it should be replaced with a per-image cache.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 15:42:45 +0000 (17:42 +0200)]
merge from trunk

11 years agoFix infinite frame selection loop (Bug#15025).
Dmitry Antipov [Thu, 15 Aug 2013 15:37:03 +0000 (19:37 +0400)]
Fix infinite frame selection loop (Bug#15025).
* frame.c (delete_frame): Prefer fast ad-hoc loop to next_frame.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 15:32:29 +0000 (17:32 +0200)]
merge from trunk

11 years agoFix bug #15099 with 'box' face attribute in display tables.
Eli Zaretskii [Thu, 15 Aug 2013 15:28:53 +0000 (18:28 +0300)]
Fix bug #15099 with 'box' face attribute in display tables.

 src/xdisp.c (next_element_from_display_vector): Support 'box' face attribute
 in the face definitions of a display vector.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 15:21:47 +0000 (17:21 +0200)]
merge from trunk

11 years agoFix bug #15090 with redisplay under linum-mode and visual-line-mode.
Eli Zaretskii [Thu, 15 Aug 2013 15:20:03 +0000 (18:20 +0300)]
Fix bug #15090 with redisplay under linum-mode and visual-line-mode.

 src/xdisp.c (compute_window_start_on_continuation_line): When
 WORD_WRAP is in effect, use move_it_to instead of move_it_by_lines
 to make sure we end up setting the window start at the leftmost
 visible character of the display line.  This avoids funky
 horizontal shifting because the window start is not kept on the
 same position.

11 years ago* image.c (imagemagick_compute_animated_image): Implement animated images.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 15:10:12 +0000 (17:10 +0200)]
* image.c (imagemagick_compute_animated_image): Implement animated images.

Fixes: debbugs:14700
11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 15:06:31 +0000 (17:06 +0200)]
merge from trunk

11 years ago* lisp.h (FOR_EACH_ALIST_VALUE): New macro
Dmitry Antipov [Thu, 15 Aug 2013 14:52:53 +0000 (18:52 +0400)]
* lisp.h (FOR_EACH_ALIST_VALUE): New macro
to do `for' loops over alist values.
* buffer.h (FOR_EACH_BUFFER):
* process.c (FOR_EACH_PROCESS): Use it.
(handle_child_signal, status_notify, Fget_buffer_process)
(kill_buffer_processes): Use FOR_EACH_PROCESS.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 14:41:34 +0000 (16:41 +0200)]
merge from trunk

11 years agoRemove byte compiler warnings, visible when compiling with
Michael Albinus [Thu, 15 Aug 2013 14:29:08 +0000 (16:29 +0200)]
Remove byte compiler warnings, visible when compiling with
`byte-compile-force-lexical-warnings' set to t.

* net/tramp.el (tramp-debug-message, tramp-message, tramp-error)
(tramp-error-with-buffer): Rename ARGS to ARGUMENTS and BUFFER to BUF.
(tramp-handle-unhandled-file-name-directory)
(tramp-handle-file-notify-add-watch, tramp-action-login)
(tramp-action-succeed, tramp-action-permission-denied)
(tramp-action-terminal, tramp-action-process-alive): Prefix unused
arguments with "_".

* net/tramp-adb.el (tramp-adb-parse-device-names)
(tramp-adb-handle-insert-directory, tramp-adb-handle-delete-file)
(tramp-adb-handle-copy-file): Prefix unused arguments with "_".
(tramp-adb-handle-file-truename): Remove unused arguments.

* net/tramp-cache.el (tramp-flush-directory-property)
(tramp-flush-connection-property, tramp-list-connections)
(tramp-parse-connection-properties): Prefix unused arguments with "_".

* net/tramp-compat.el (tramp-compat-make-temp-file): Rename
FILENAME to F.

* net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch)
(tramp-gvfs-handle-write-region, tramp-bluez-parse-device-names)
(tramp-zeroconf-parse-workstation-device-names)
(tramp-zeroconf-parse-webdav-device-names)
(tramp-synce-parse-device-names): Prefix unused arguments with "_".

* net/tramp-gw.el (tramp-gw-gw-proc-sentinel)
(tramp-gw-aux-proc-sentinel): Prefix unused arguments with "_".

* net/tramp-sh.el (tramp-sh-handle-file-truename): Remove unused
arguments.
(tramp-sh-handle-copy-file, tramp-sh-handle-dired-compress-file)
(tramp-sh-handle-insert-file-contents-literally)
(tramp-sh-handle-file-notify-add-watch): Prefix unused arguments
with "_".
(tramp-do-copy-or-rename-file, tramp-barf-if-no-shell-prompt):
Remove unused variables.

* net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-copy-file, tramp-smb-handle-delete-file)
(tramp-smb-read-file-entry): Prefix unused arguments with "_".

* net/tramp-uu.el (tramp-uu-b64-alphabet, tramp-uu-b64-char-to-byte):
Make them a defconst.
(tramp-uuencode-region): Remove unused variable.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 08:41:34 +0000 (10:41 +0200)]
merge from trunk

11 years ago* doc/lispref/markers.texi (The Region): Add/move indexes.
Xue Fuqiao [Thu, 15 Aug 2013 08:27:22 +0000 (16:27 +0800)]
* doc/lispref/markers.texi (The Region): Add/move indexes.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 06:47:50 +0000 (08:47 +0200)]
merge from trunk

11 years agoStop keeping etc/refcards generated PDFs in the repository
Glenn Morris [Thu, 15 Aug 2013 06:38:44 +0000 (23:38 -0700)]
Stop keeping etc/refcards generated PDFs in the repository

They are on the gnu.org website and will be in the release tarfiles.

* admin/make-tarball.txt: Mention generating pdfs in etc/refcards.

* etc/refcards/calccard.pdf, etc/refcards/cs-dired-ref.pdf:
* etc/refcards/cs-refcard.pdf, etc/refcards/de-refcard.pdf:
* etc/refcards/dired-ref.pdf, etc/refcards/fr-dired-ref.pdf:
* etc/refcards/fr-refcard.pdf, etc/refcards/gnus-booklet.pdf:
* etc/refcards/gnus-refcard.pdf, etc/refcards/orgcard.pdf:
* etc/refcards/pl-refcard.pdf, etc/refcards/pt-br-refcard.pdf:
* etc/refcards/refcard.pdf, etc/refcards/ru-refcard.pdf:
* etc/refcards/sk-dired-ref.pdf, etc/refcards/sk-refcard.pdf:
Remove generated files from repository.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 06:36:59 +0000 (08:36 +0200)]
merge from trunk

11 years agoCleanup for etc/refcards/Makefile and related items
Glenn Morris [Thu, 15 Aug 2013 06:31:14 +0000 (23:31 -0700)]
Cleanup for etc/refcards/Makefile and related items

* .bzrignore: Unignore etc/refcards/Makefile.

* make-dist: Do not distribute etc/refcards TeX intermediate files.

* Makefile.in (install-arch-indep):
Do not install etc/refcards TeX intermediate files.

* etc/refcards/Makefile: Rewrite to use portable Makefile syntax.
Add language-specific targets.
(distclean, extraclean): New rules.

*  etc/refcards/README: Add copyright and license.  Add Makefile details.
Mention http and FSF store versions.

11 years ago* admin/notes/hydra: More information about Hydra.
Xue Fuqiao [Thu, 15 Aug 2013 06:23:40 +0000 (14:23 +0800)]
* admin/notes/hydra: More information about Hydra.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 05:41:16 +0000 (07:41 +0200)]
merge from trunk

11 years ago* term.c (get_named_tty, create_tty_output, tty_free_frame_resources)
Dmitry Antipov [Thu, 15 Aug 2013 05:23:40 +0000 (09:23 +0400)]
* term.c (get_named_tty, create_tty_output, tty_free_frame_resources)
(tty_free_frame_resources, delete_tty): Prefer eassert to emacs_abort.
* image.c (make_image_cache): For struct image_cache, prefer xmalloc
to xzalloc and so avoid redundant call to memset.
* xterm.c (x_term_init): Avoid unnecessary initializations of dpyinfo
members because it is allocated with xzalloc and so already zeroed.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 19:21:56 +0000 (21:21 +0200)]
merge from trunk

11 years ago* src/gmalloc.c [CYGWIN]: Rename memalign (Bug#15094).
Ken Brown [Wed, 14 Aug 2013 19:09:51 +0000 (15:09 -0400)]
* src/gmalloc.c [CYGWIN]: Rename memalign (Bug#15094).

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 16:51:46 +0000 (18:51 +0200)]
merge from trunk

11 years agoUtility function and macro to copy Lisp string to C string.
Dmitry Antipov [Wed, 14 Aug 2013 16:36:16 +0000 (20:36 +0400)]
Utility function and macro to copy Lisp string to C string.
* lisp.h (xlispstrdupa): New macro.
(xlispstrdup): New prototype.
* alloc.c (xlispstrdup): New function.
* callint.c (Fcall_interactively):
* fileio.c (Ffile_name_directory, Fexpand_file_name)
(Fsubstitute_in_file_name):
* frame.c (Fmake_terminal_frame): Use xlispstrdupa.
* image.c (x_create_bitmap_from_file):
* w32term.c (w32_term_init):
* xterm.c (x_term_init): Use xlispstrdup.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 14:07:18 +0000 (16:07 +0200)]
merge from trunk

11 years agoRefine previous change.
Xue Fuqiao [Wed, 14 Aug 2013 14:02:46 +0000 (22:02 +0800)]
Refine previous change.

11 years ago* src/marker.c (set_marker): Reformat documentation.
Xue Fuqiao [Wed, 14 Aug 2013 13:58:25 +0000 (21:58 +0800)]
* src/marker.c (set_marker): Reformat documentation.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 13:57:34 +0000 (15:57 +0200)]
merge from trunk

11 years ago* image.c (imagemagick_load_image): Make animated pictures work.
Lars Magne Ingebrigtsen [Wed, 14 Aug 2013 13:50:03 +0000 (15:50 +0200)]
* image.c (imagemagick_load_image): Make animated pictures work.

There's still some problems with background color settings, though.

Fixes: debbugs:14700
11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 13:42:07 +0000 (15:42 +0200)]
merge from trunk

11 years agolisp/frameset.el: Allow orphaned minibufferless frames.
Juanma Barranquero [Wed, 14 Aug 2013 13:41:02 +0000 (15:41 +0200)]
lisp/frameset.el: Allow orphaned minibufferless frames.
(frameset-filter-minibuffer): Deal with the case that the minibuffer
parameter was already set in FILTERED.  Doc fix.
(frameset--record-minibuffer-relationships): Allow saving a
minibufferless frame without its corresponding minibuffer frame.
(frameset--reuse-frame): Accept a match from an orphaned minibufferless
frame, if the frame id matches.
(frameset--minibufferless-last-p): Sort non-orphaned minibufferless
frames before orphaned ones.
(frameset-restore): Warn about orphaned windows, instead of error out.

11 years agolisp/frameset.el: Use gv-setter declaration.
Juanma Barranquero [Wed, 14 Aug 2013 13:30:13 +0000 (15:30 +0200)]
lisp/frameset.el: Use gv-setter declaration.
(frameset--prop-setter): New function.
(frameset-prop): Add gv-setter declaration.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 13:04:45 +0000 (15:04 +0200)]
merge from trunk

11 years ago* url-http.el (url-http-parse-headers): Always place point at the
Lars Magne Ingebrigtsen [Wed, 14 Aug 2013 13:03:25 +0000 (15:03 +0200)]
* url-http.el (url-http-parse-headers): Always place point at the
start of the buffer instead of just 80% of the time.

11 years ago* decompress.c (unwind_decompress): Always restore point.
Lars Magne Ingebrigtsen [Wed, 14 Aug 2013 12:47:05 +0000 (14:47 +0200)]
* decompress.c (unwind_decompress): Always restore point.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 10:56:43 +0000 (12:56 +0200)]
merge from trunk

11 years ago* doc/emacs/files.texi (Filesets): Add an index.
Xue Fuqiao [Wed, 14 Aug 2013 10:45:10 +0000 (18:45 +0800)]
* doc/emacs/files.texi (Filesets): Add an index.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 10:31:41 +0000 (12:31 +0200)]
merge from trunk

11 years agoAuto-commit of generated files.
Glenn Morris [Wed, 14 Aug 2013 10:17:37 +0000 (06:17 -0400)]
Auto-commit of generated files.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 09:26:46 +0000 (11:26 +0200)]
merge from trunk

11 years agoFix some issues in window.el.
Martin Rudalics [Wed, 14 Aug 2013 09:14:32 +0000 (11:14 +0200)]
Fix some issues in window.el.

* window.el (window-make-atom): Don't overwrite parameter
already present.
(display-buffer-in-atom-window): Handle special case where we
split an already atomic window.
(window--major-non-side-window, display-buffer-in-side-window)
(window--side-check): Ignore minibuffer window when walking
window tree.
(window-deletable-p): Return 'frame only if no other frame uses
our minibuffer window.
(record-window-buffer): Run buffer-list-update-hook.
(split-window): Make sure window--check-frame won't destroy an
existing atomic window in case the new window gets nested
inside.
(display-buffer-at-bottom): Ignore minibuffer window when
walking window tree.  Don't split a side window.
(pop-to-buffer): Don't set-buffer here, the select-window call
should do that.
(mouse-autoselect-window-select): Autoselect only if we are in the
text portion of the window.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 07:43:14 +0000 (09:43 +0200)]
merge from trunk

11 years ago* xdisp.c (redisplay_window): If window_end_valid is cleared due to
Dmitry Antipov [Wed, 14 Aug 2013 07:25:45 +0000 (11:25 +0400)]
* xdisp.c (redisplay_window): If window_end_valid is cleared due to
non-zero windows_or_buffers_changed, clear current_matrix_up_to_date_p
and so do not call to try_cursor_movement for that window.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 07:11:58 +0000 (09:11 +0200)]
merge from trunk

11 years ago* xdisp.c (cursor_type_changed): Now static.
Paul Eggert [Wed, 14 Aug 2013 07:05:54 +0000 (00:05 -0700)]
* xdisp.c (cursor_type_changed): Now static.

11 years ago* image.c (imagemagick_filename_hint): New arg HINT_BUFFER.
Paul Eggert [Wed, 14 Aug 2013 07:00:25 +0000 (00:00 -0700)]
* image.c (imagemagick_filename_hint): New arg HINT_BUFFER.

Use changed.  This avoids the need to call xmalloc and for the
caller to call xfree, and avoids memory leaks in some situations.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 06:37:00 +0000 (08:37 +0200)]
merge from trunk

11 years ago* xdisp.c (adjust_window_ends): Move duplicated code to new function.
Dmitry Antipov [Wed, 14 Aug 2013 06:06:56 +0000 (10:06 +0400)]
* xdisp.c (adjust_window_ends): Move duplicated code to new function.
(try_window, try_window_reusing_current_matrix, try_window_id): Use it.

11 years ago* window.h (struct window): Convert window_end_pos and
Dmitry Antipov [Wed, 14 Aug 2013 05:41:48 +0000 (09:41 +0400)]
* window.h (struct window): Convert window_end_pos and
window_end_vpos from Lisp_Object to ptrdiff_t and int, respectively.
(wset_window_end_pos, wset_window_end_vpos): Remove.
* dispnew.c (adjust_glyph_matrix):
* window.c (Fwindow_end, replace_window, set_window_buffer)
(make_window):
* xdisp.c (check_window_end, move_it_to, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, try_window)
(try_window_reusing_current_matrix, find_first_unchanged_at_end_row)
(try_window_id, decode_mode_spec, mouse_face_from_buffer_pos)
(note_mouse_highlight): Adjust users.
(try_cursor_movement): Likewise.  Convert old precondition to eassert.
Add comment.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 04:41:21 +0000 (06:41 +0200)]
merge from trunk

11 years agoFix --enable-gcc-warnings errors introduced in 2013-08-13 commit.
Dmitry Antipov [Wed, 14 Aug 2013 04:27:32 +0000 (08:27 +0400)]
Fix --enable-gcc-warnings errors introduced in 2013-08-13 commit.
* image.c (imagemagick_filename_hint): Use `const char *' and
prefer SSDATA to SDATA to avoid warnings.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 04:21:25 +0000 (06:21 +0200)]
merge from trunk

11 years agoCleanup window fringes, margins and scroll bars adjustments.
Dmitry Antipov [Wed, 14 Aug 2013 04:09:37 +0000 (08:09 +0400)]
Cleanup window fringes, margins and scroll bars adjustments.
* window.c (set_window_fringes, set_window_margins)
(set_window_scroll_bars, apply_window_adjustment): New functions.
(set_window_buffer, Fset_window_margins, Fset_window_fringes)
(Fset_window_scroll_bars): Use them.

11 years ago* window.h (struct window): Convert scroll_bar_width
Dmitry Antipov [Wed, 14 Aug 2013 04:07:14 +0000 (08:07 +0400)]
* window.h (struct window): Convert scroll_bar_width
from Lisp_Object to integer.  Adjust comment.
(WINDOW_CONFIG_SCROLL_BAR_WIDTH, WINDOW_CONFIG_SCROLL_BAR_COLS):
Adjust users.
* window.c (wset_scroll_bar_width): Remove.
(make_window): Initialize scroll_bar_width.
(Fsplit_window_internal): Use direct assignment.
(Fset_window_configuration, save_window_save):
Convert Lisp_Object to integer and back where appropriate.
(Fset_window_scroll_bars): Adjust user.  Return t if any scroll
bar was actually changed, and mention this in docstring.

11 years agomerge from trunk
Joakim Verona [Wed, 14 Aug 2013 02:28:55 +0000 (04:28 +0200)]
merge from trunk

11 years ago* configure.ac (EMACS_CONFIGURATION): Escape backslashes.
Ulrich Mueller [Wed, 14 Aug 2013 02:15:01 +0000 (22:15 -0400)]
* configure.ac (EMACS_CONFIGURATION): Escape backslashes.

Fixes: debbugs:15091