[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] [emacs] 01/02: Merge from emacs-24
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] [emacs] 01/02: Merge from emacs-24 |
|
Date: |
Sun, 16 Nov 2014 05:23:50 +0000 |
monnier pushed a commit to branch master
in repository emacs.
commit 9075fcc1937a211bc91e8bc49c332bc55ac99e24
Merge: 86009dd 4f4cf9c
Author: Stefan Monnier <address@hidden>
Date: Sun Nov 16 00:22:20 2014 -0500
Merge from emacs-24
.gitignore | 18 +++++-
ChangeLog | 19 +++++-
admin/ChangeLog | 16 ++++--
admin/update_autogen | 13 ++++-
lisp/ChangeLog | 36 +++++++++---
lisp/gnus/ChangeLog | 4 +
lisp/mail/emacsbug.el | 17 ++++--
lisp/progmodes/python.el | 52 +++++++++++------
lisp/version.el | 4 +-
src/ChangeLog | 24 +++++++-
src/nsfns.m | 23 +++++++-
src/nsmenu.m | 5 ++
src/nsterm.m | 1 -
src/window.c | 18 ++++--
src/window.h | 2 +-
test/ChangeLog | 11 ++++
test/automated/python-tests.el | 119 ++++++++++++++++++++++++++++++++++++++++
17 files changed, 321 insertions(+), 61 deletions(-)
diff --cc .gitignore
index b548384,6903c46..1fb7d49
--- a/.gitignore
+++ b/.gitignore
@@@ -12,6 -12,7 +12,7 @@@ autom4te.cach
makefile
TAGS
*~
-.#*
++.#*
/README.W32
/bin/
diff --cc ChangeLog
index 6d8543c,5ec8127..885be44
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,35 -1,21 +1,47 @@@
-2014-11-15 Christoph Scholtes <address@hidden>
++2014-11-16 Christoph Scholtes <address@hidden>
+
+ * .gitignore: Ignore generated file lib/stdalign.h.
+
-2014-11-13 Paul Eggert <address@hidden>
++2014-11-16 Paul Eggert <address@hidden>
+
+ Backport fix for minor Bazaar leftovers.
+ * .dir-locals.el: Remove reference to bzr commit --fixes debbugs.
+
-2014-11-13 Eli Zaretskii <address@hidden>
++2014-11-16 Eli Zaretskii <address@hidden>
+
+ * .gitignore: Add more ignorables.
+
+2014-11-14 Andreas Schwab <address@hidden>
+
+ * Makefile.in (config.status): Don't depend on
+ ${srcdir}/lisp/version.el.
+
+2014-11-14 Paul Eggert <address@hidden>
+
+ Merge from gnulib.
+ 2014-11-14 extern-inline: update commentary about GCC bugs
+ 2014-11-06 unistd: port to iOS
+ 2014-11-04 update from texinfo
+ * doc/misc/texinfo.tex, lib/unistd.in.h, m4/extern-inline.m4:
+ Update from gnulib.
+
+ build: port to GCC 4.6.4 + glibc 2.5
+ On platforms this old, building with _FORTIFY_SOURCE equal to 2
+ results in duplicate definitions of standard library functions.
+ Problem reported by Nelson H. F. Beebe.
+ * configure.ac (_FORTIFY_SOURCE): Sort after GNULIB_PORTCHECK.
+ By default, do not enable this unless GNULIB_PORTCHECK is defined.
+ This better matches the original intent, which as I recall was to
+ enable these extra checks only with --enable-gcc-warnings.
+
+2014-11-14 David Reitter <address@hidden>
+
+ * Makefile.in (install-arch-indep): Compress publicsuffix.txt file.
+
2014-11-13 Lars Magne Ingebrigtsen <address@hidden>
* .gitignore: Copy over sufficient ignorable files from the old
-- .bzrignore that a simple build doesn't list lots of unregistered
-- files.
++ .bzrignore that a simple build doesn't list lots of unregistered files.
2014-11-11 Eric S. Raymond <address@hidden>
@@@ -45,29 -31,8 +57,28 @@@
The last CVS commit was 2009-12-27T08:11:address@hidden)
Committer/author email addresses are generally correct for the
-- transition day, not necessarily when the comit was originally
-- made.
++ transition day, not necessarily when the comit was originally made.
+
+2014-11-10 Glenn Morris <address@hidden>
+
+ * configure.ac (doc/man/emacs.1): Generate it.
+ * Makefile.in (top_bootclean): Remove doc/man/emacs.1.
+ * make-dist: Do not distribute doc/man/emacs.1.
+
+ * configure.ac (etc/refcards/emacsver.tex): Generate it.
+ * Makefile.in (etc-emacsver): New PHONY rule.
+ (bootstrap-clean): Delete etc/refcards/emacsver.tex.
+
+ * configure.ac (doc/emacs/emacsver.texi): Generate it.
+ * make-dist (doc/emacs/emacsver.texi) [update]: No longer check it.
+
+2014-11-08 Dani Moncayo <address@hidden>
+
+ * build-aux/msys-to-w32: Simplify the initial over-engineered
+ interface, and the implementation.
+ * Makefile.in (epaths-force-w32): Update for the above. Also
+ simplify, assuming that the shell is bash (which is the case in MSYS).
+ (msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer used).
2014-11-05 Glenn Morris <address@hidden>
diff --cc admin/ChangeLog
index 900da6a,72ce74b..96a98e5
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,52 -1,19 +1,58 @@@
-2014-11-15 Glenn Morris <address@hidden>
++2014-11-16 Glenn Morris <address@hidden>
+
+ * update_autogen: Auto-detect VCS in use.
+ (vcs): New variable.
+ (status, commit, main): Handle git.
+
+2014-11-13 Andreas Schwab <address@hidden>
+
+ * make-tarball.txt: Make annotated tag and push it out.
+
2014-11-11 Eric S. Raymond <address@hidden>
* make-tarball.txt, update-copyright, admin/notes/bugtracker,
admin/notes/tags, admin/update-copyright, admin/update_autogen:
admin/repo.notes: git transition.
-2014-11-09 Eli Zaretskii <address@hidden>
+2014-11-10 Eli Zaretskii <address@hidden>
+
- * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
- unmsys--file-name. (Bug#18955)
++ * unidata/Makefile.in (${top_srcdir}/src/macuvs.h):
++ Use unmsys--file-name. (Bug#18955)
+
+2014-11-10 Glenn Morris <address@hidden>
+
+ * admin.el (set-version): No need to update doc/man/emacs.1.
+
+ * admin.el (set-version): No need to update etc/refcards/emacsver.tex.
+ (set-copyright): Update etc/refcards/emacsver.tex.in.
+
+ * admin.el (set-version): No need to update doc/emacs/emacsver.texi.
+ (make-manuals-dist-output-variables): Add top_srcdir.
+ (make-manuals-dist--1): Handle @version@ specially.
+
+2014-11-09 Eric Ludlam <address@hidden>
+
+ * grammars/c.by (template-type): Add :template-specifier and
+ :typevar to capture extra details about the template.
- (opt-post-fcn-modifiers): Splice in the found symbol into the
++ (opt-post-fcn-modifiers): Splice in the found symbol into the
+ return value correctly.
+ (QUESTION): New punctuation.
+ (expression): Add ternary conditional support.
+
+ * grammars/scheme.by (MODULE): New token.
+ (scheme): Handle expanding the MODULE tag.
+ (scheme-list): Remove closeparen required match.
- (scheme-in-list): Remove extraneous matches for DEFINE. Add
- support for MODULE Simplify matching for code & make work.
++ (scheme-in-list): Remove extraneous matches for DEFINE.
++ Add support for MODULE Simplify matching for code & make work.
+ (name-args, name-arg-list, name-arg-expand): Make it work.
- * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
- unmsys--file-name. (Bug#18955)
+2014-11-09 David Engster <address@hidden>
+
+ * grammars/c.by (opt-brackets-after-symbol): New.
+ (multi-stage-dereference): Use it. Add rules for explicit
+ matching the last dereference. We cannot just juse
+ 'namespace-symbol' as a single rule, since this would match too
+ greedy and mess with parsing default values of variables.
2014-11-09 Glenn Morris <address@hidden>
diff --cc lisp/ChangeLog
index 634412e,a4bebf2..42de048
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,139 -1,37 +1,159 @@@
-2014-11-15 Andreas Schwab <address@hidden>
++2014-11-16 Andreas Schwab <address@hidden>
+
+ * version.el (emacs-repository-get-version): Use git rev-parse
+ instead of git log.
+
-2014-11-15 Fabián Ezequiel Gallina <address@hidden>
-
- * progmodes/python.el (python-indent-calculate-levels): Fix
- indentation behavior multiline dedenter statement. (Bug#18432)
-
-2014-11-15 Fabián Ezequiel Gallina <address@hidden>
++2014-11-16 Fabián Ezequiel Gallina <address@hidden>
+
- * progmodes/python.el (python-indent-region): Use
- python-indent-line and skip special cases. (Bug#18843)
++ * progmodes/python.el (python-indent-calculate-levels):
++ Fix indentation behavior multiline dedenter statement. (Bug#18432)
+
-2014-11-15 Michael Albinus <address@hidden>
++2014-11-16 Fabián Ezequiel Gallina <address@hidden>
+
- * vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940)
++ * progmodes/python.el (python-indent-region):
++ Use python-indent-line and skip special cases. (Bug#18843)
+
-2014-10-28 Peder O. Klingenberg <address@hidden> (tiny change)
++2014-11-16 Peder O. Klingenberg <address@hidden> (tiny change)
+
+ * mail/emacsbug.el (report-emacs-bug): Make a better guess at
+ envelope-from when reporting through sendmail (bug#19054).
+
+2014-11-16 Stefan Monnier <address@hidden>
+
- * emacs-lisp/backquote.el (backquote-process): Optimize away the ,'
case.
++ * emacs-lisp/backquote.el (backquote-process): Optimize away ",'".
+
+2014-11-15 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww-search-words): Mention `eww-search-prefix'.
+
+2014-11-15 Fabián Ezequiel Gallina <address@hidden>
+
+ * progmodes/python.el (python-eldoc-setup-code): Enhance string
+ type checks, simplify printing. (Bug#18962)
+
2014-11-14 Ivan Andrus <address@hidden>
- * progmodes/python.el (python-ffap-module-path): Use
- `derived-mode-p' instead of equality test on `major-mode'.
+ * progmodes/python.el (python-shell-font-lock-kill-buffer):
+ (python-shell-font-lock-with-font-lock-buffer)
+ (python-shell-get-buffer, python-ffap-module-path):
+ Use `derived-mode-p' instead of equality test on `major-mode'.
+
+2014-11-14 Fabián Ezequiel Gallina <address@hidden>
+
+ * progmodes/python.el (python-shell-virtualenv-root): Rename from
+ python-shell-virtualenv-path.
+ (python-shell-internal-get-process-name)
+ (python-shell-calculate-process-environment)
+ (python-shell-calculate-exec-path): Use it.
+
+2014-11-14 Eli Zaretskii <address@hidden>
+
+ * bindings.el (search-map): Fix last change: don't use 'kbd' in
+ bindings.el, since it is not yet loaded when bindings.el is
+ preloaded.
+
+2014-11-14 Fabián Ezequiel Gallina <address@hidden>
+
+ * progmodes/python.el (python-shell-completion-get-completions):
+ Fix previous merge.
+
+2014-11-14 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww-render): Don't set the title to the URL.
2014-11-13 Ulrich Müller <address@hidden>
* version.el (emacs-repository-get-version): Call `git log'
command with proper format argument (bug#19049).
+2014-11-14 Lars Magne Ingebrigtsen <address@hidden>
+
+ * bindings.el (search-map): Bind M-s M-s to `eww-search-words'.
+
+2014-11-14 Kenjiro NAKAYAMA <address@hidden>
+
+ * net/eww.el (eww-search-words): New command (bug#16258).
+
+2014-11-13 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/shr.el (shr-inhibit-images): Add a doc string.
+
+ * net/eww.el (eww-after-render-hook): New variable.
+ (eww-render): Use it.
+
+ * net/shr.el (shr-descend): Don't descend further than
+ `max-specpdl-size' allows (bug#16587).
+ (shr-depth): New variable.
+ (shr-warning): New variable.
+
+2014-11-13 Ivan Shmakov <address@hidden>
+
+ * net/shr.el (shr-parse-base): Handle <base href=""> correctly.
+ (shr-expand-url): Expand absolute URLs correctly (bug#17958).
+
+2014-11-13 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww): Add comment to clarify.
+
+ * net/shr.el (shr-parse-image-data): Remove blocked bits from
+ external SVG images.
+ (shr-tag-object): Display images in <object> forms (bug#16244).
+ (shr-tag-table): Also insert <objects> after the tables.
+
+2014-11-13 Michael Albinus <address@hidden>
+
+ * vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940)
+
+2014-11-13 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww-form-file): Fix version number.
+
+2014-11-10 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww-form-file): :type isn't a valid `defface' keyword.
+
+2014-11-10 Kenjiro NAKAYAMA <address@hidden>
+
- * net/eww.el(eww-form-file(defface)): New defface of file upload form.
- (eww-submit-file): New key map of file upload.
- (eww-form-file): New file upload button and file name context.
- (eww-select-file): Select file and display selected file name.
- (eww-tag-input): Handle input tag of file type.
- (eww-update-field): Add point offset.
- (eww-submit): Add submit with multipart/form-data.
++ * net/eww.el(eww-form-file(defface)): New defface of file upload form.
++ (eww-submit-file): New key map of file upload.
++ (eww-form-file): New file upload button and file name context.
++ (eww-select-file): Select file and display selected file name.
++ (eww-tag-input): Handle input tag of file type.
++ (eww-update-field): Add point offset.
++ (eww-submit): Add submit with multipart/form-data.
+
+2014-11-10 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww-render, eww-display-html, eww-setup-buffer):
+ Allow taking a buffer to render data in. This allows using several
+ eww buffers (bug#16211).
+
+2014-11-10 Charles Rendleman <address@hidden> (tiny change)
+
+ * net/eww.el (eww-download-callback): Save only the file contents,
+ not the headers.
+
+2014-11-10 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww-data): New plist to store all the data relevant
+ to a single page, used throughout the file instead of the
+ variables `eww-current-url', `eww-current-dom',
+ `eww-current-source', and `eww-current-title'.
+ (eww-readable): Copy over pertinent data from the parent page.
+ (eww-save-history): Don't let the history grow infinitely.
+
+ * net/eww.el: Remove `eww-next-url', `eww-previous-url',
+ `eww-up-url', `eww-home-url', `eww-start-url' and
+ `eww-contents-url' and put the data into the `eww-data' plist.
+ This allow restoring these values after going back in the history.
+
+2014-11-10 Sylvain Chouleur <address@hidden> (tiny change)
+
+ Allow VTIMEZONE where daylight and standard time zones are equal.
+ See: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00494.html
+ * calendar/icalendar.el (icalendar--convert-tz-offset):
+ Support timezone without daylight saving time.
+
2014-11-10 Glenn Morris <address@hidden>
* startup.el (command-line): Handle nil elements in load-path.
diff --cc lisp/gnus/ChangeLog
index e107dbd,6713df8..1d9b146
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@@ -1,39 -1,7 +1,43 @@@
-2014-11-10 Adam Sjøgren <address@hidden>
++2014-11-16 Adam Sjøgren <address@hidden>
+
+ * mml2015.el (mml2015-display-key-image): New variable.
+
+2014-11-14 Lars Magne Ingebrigtsen <address@hidden>
+
+ * gnus-sum.el (gnus-summary-exit-no-update): Don't query about
+ discarding changes in ephemeral groups.
+
+ * ietf-drums.el (ietf-drums-parse-address): Don't issue warnings about
+ things the user isn't interested in.
+
+2014-11-13 Julien Danjou <address@hidden>
+
+ * gnus-notifications.el (gnus-notifications-notify): Provide both
+ app-icon and image-path.
+
+2014-11-10 Kenjiro NAKAYAMA <address@hidden>
+
+ * gnus/mm-url.el (mm-url-encode-multipart-form-data):
+ Restore to handle "multipart/form-data" by eww.
+
+2014-11-07 Tassilo Horn <address@hidden>
+
+ * gnus-start.el (gnus-activate-group): Fix typo reported by Tim
+ Landscheidt.
+
+2014-10-29 Paul Eggert <address@hidden>
+
+ Simplify use of current-time and friends.
+ * gnus-delay.el (gnus-delay-article):
+ * gnus-sum.el (gnus-summary-read-document):
+ * gnus-util.el (gnus-seconds-today, gnus-seconds-month):
+ * message.el (message-make-expires-date):
+ Omit unnecessary call to current-time.
+ * gnus-util.el (gnus-float-time): Simplify to an alias because
+ time-to-seconds now behaves like float-time with respect to nil arg.
+ (gnus-seconds-year): Don't call current-time twice to get the current
+ time stamp, as this can lead to inconsistent results.
+
2014-10-27 Katsumi Yamaoka <address@hidden>
* gnus.el (gnus-mode-line-buffer-identification):
diff --cc src/ChangeLog
index cf35218,4aa9958..7bb1666
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,32 -1,28 +1,51 @@@
-2014-11-15 Jan Djärv <address@hidden>
-
- * nsterm.m (ns_send_appdefined): Check for application defined
- event on Cocoa (Bug#18993). Backport from trunk.
-
-2014-11-15 Eli Zaretskii <address@hidden>
++2014-11-16 Eli Zaretskii <address@hidden>
+
+ * window.c (window_scroll_pixel_based): Avoid truncation/rounding
+ errors in computing the number of pixels to scroll. Suggested by
+ Kelly Dean <address@hidden>. (Bug#19060)
+
-2014-11-15 Jan Djärv <address@hidden>
++2014-11-16 Jan Djärv <address@hidden>
+
+ * nsmenu.m (update_frame_tool_bar): If tool bar changes height,
+ call updateFrameSize.
+
+ * nsterm.m (setFrame:): Remove call to display (Bug#18757).
+
-2014-11-14 Jan Djärv <address@hidden>
++2014-11-16 Jan Djärv <address@hidden>
+
+ * nsfns.m (x_set_foreground_color, x_set_background_color)
+ (x_set_cursor_color, Fxw_color_values): Block/unblock input,
+ use SET_FRAME_GARBAGED instead of redraw_frame (Bug#19036).
+
-2014-11-09 Eli Zaretskii <address@hidden>
+2014-11-15 Jan Djärv <address@hidden>
+
+ * nsterm.m (ns_send_appdefined): Check for application defined
+ event on Cocoa (Bug#18993).
+ (run): Restore code before the previous 18993 fix.
+
+2014-11-14 David Reitter <address@hidden>
+
- * nsterm.m (run): set timeout for event loop to prevent hang.
++ * nsterm.m (run): Set timeout for event loop to prevent hang.
+ (Bug#18993)
+
+2014-11-14 Paul Eggert <address@hidden>
+
+ * .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1.
+
+2014-11-14 Dmitry Antipov <address@hidden>
+
+ * xfont.c (xfont_list_pattern): Do not allocate font entity object
+ for each candidate font but attempt to reuse it from previous improper
+ candidate, if any.
+
+2014-11-13 Paul Eggert <address@hidden>
+
+ Avoid undefined behavior in color table hashing.
+ * image.c (CT_HASH_RGB) [COLOR_TABLE_SUPPORT]: Remove, replacing with
...
+ (ct_hash_rgb) [COLOR_TABLE_SUPPORT]: New function. All uses changed.
+ This function avoids undefined behavior with signed shift overflow.
+
+2014-11-10 Eli Zaretskii <address@hidden>
* fileio.c (Finsert_file_contents): Invalidate buffer caches also
when the inserted text does not need decoding. (Bug#18982)
@@@ -2558,521 -490,7 +2577,520 @@@
left_col, and top_line are C integers (and has been so for the
last 1.5 years).
-2014-07-20 Jan Djärv <address@hidden>
+ * .gdbinit (xsubchartable): The members 'depth' and 'min_char' are
+ now C integers.
+
+2014-07-28 Dmitry Antipov <address@hidden>
+
+ On GNU/Linux, use timerfd for asynchronous timers.
+ * atimer.c (toplevel) [HAVE_TIMERFD]: Include sys/timerfd.h.
+ (toplevel): Rename alarm_timer_ok to special_timer_available.
+ [HAVE_TIMERFD]: Declare timerfd.
+ [HAVE_CLOCK_GETRES]: Declare resolution.
+ (start_atimer) [HAVE_CLOCK_GETRES]: Round up timestamp to
+ system timer resolution.
+ (set_alarm) [HAVE_TIMERFD]: Use timerfd_settime.
+ (timerfd_callback) [HAVE_TIMERFD]: New function.
+ (atimer_result, debug_timer_callback, Fdebug_timer_check)
+ [ENABLE_CHECKING]: New function for the sake of automated tests.
+ (init_atimer) [HAVE_TIMERFD]: Setup timerfd.
+ [HAVE_CLOCK_GETRES]: Likewise for system timer resolution.
+ [ENABLE_CHECKING]: Defsubr test function.
+ * atimer.h (timerfd_callback) [HAVE_TIMERFD]: Add prototype.
+ * lisp.h (add_timer_wait_descriptor) [HAVE_TIMERFD]: Likewise.
+ * process.c (add_timer_wait_descriptor) [HAVE_TIMERFD]: New function.
+
+ Fix --without-x build and pacify --enable-gcc-warnings.
+ Problems reported in Bug#18122 and Bug#18124.
+ * frame.c (get_frame_param): Define even if !HAVE_WINDOW_SYSTEM.
+ (frame_windows_min_size): Now static.
+ * frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS) [!HAVE_WINDOW_SYSTEM]:
+ Define as no-op.
+ (adjust_frame_size): Always declare prototype.
+
+ Fix Gnus-related issues reported by David Kastrup <address@hidden> in
+ <http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00370.html>.
+ * atimer.c (timerfd_callback): Always read expiration data.
+ Add comment.
+ (turn_on_atimers) [HAVE_TIMERFD]: Disarm timerfd timer.
+ * process.c (add_timer_wait_descriptor): Add timer descriptor
+ to input_wait_mask and non_process_wait_mask as well.
+
+2014-07-28 Paul Eggert <address@hidden>
+
+ * frame.c (x_set_frame_parameters): Don't use uninitialized locals.
+
+2014-07-27 Jan Djärv <address@hidden>
+
+ * nsterm.m (applicationDidFinishLaunching antialiasThresholdDidChange):
+ Reinstate code removed by the prevoius commit to this file.
+
+2014-07-27 Martin Rudalics <address@hidden>
+
+ * buffer.h (struct buffer): New fields scroll_bar_height and
+ horizontal_scroll_bar_type.
+ * buffer.c (bset_scroll_bar_height)
+ (bset_horizontal_scroll_bar_type): New functions.
+ (Fbuffer_swap_text): Handle old_pointm field.
+ (init_buffer_once): Set defaults for scroll_bar_height and
+ horizontal_scroll_bar_type.
+ (syms_of_buffer): New variables scroll_bar_height and
+ horizontal_scroll_bar_type.
+ * dispextern.h (window_part): Rename ON_SCROLL_BAR to
+ ON_VERTICAL_SCROLL_BAR. Add ON_HORIZONTAL_SCROLL_BAR.
+ (set_vertical_scroll_bar): Remove prototype.
+ (x_change_tool_bar_height): Add prototype.
+ * dispnew.c (adjust_frame_glyphs_for_frame_redisplay)
+ (window_to_frame_vpos, update_frame_1, scrolling, init_display):
+ Use FRAME_TOTAL_COLS and FRAME_TOTAL_LINES instead of FRAME_COLS
+ and FRAME_LINES.
+ (adjust_frame_glyphs_for_window_redisplay): Rearrange lines.
+ (update_window): Start mode_line_row->y after horizontal scroll
+ bar.
+ (change_frame_size_1): Call adjust_frame_size.
+ (init_display): When changing the size of a tty frame do not
+ pass height of menu bar.
+ (Qframe_windows_min_size): New symbol.
+ * frame.h (struct frame): List tool bar fields after menu bar
+ fields. Add official, total_lines, horizontal_scroll_bars,
+ config_scroll_bar_height and config_scroll_bar_lines fields.
+ (FRAME_HAS_HORIZONTAL_SCROLL_BARS)
+ (FRAME_CONFIG_SCROLL_BAR_HEIGHT, FRAME_CONFIG_SCROLL_BAR_LINES)
+ (FRAME_SCROLL_BAR_AREA_HEIGHT, FRAME_SCROLL_BAR_COLS)
+ (FRAME_SCROLL_BAR_LINES, FRAME_TOTAL_LINES, SET_FRAME_LINES)
+ (FRAME_WINDOWS_HEIGHT): New macros.
+ (SET_FRAME_HEIGHT, FRAME_TEXT_LINES_TO_PIXEL_HEIGHT)
+ (FRAME_PIXEL_Y_TO_LINE, FRAME_PIXEL_HEIGHT_TO_TEXT_LINES)
+ (FRAME_TEXT_TO_PIXEL_HEIGHT): Separately count top margin and
+ horizontal scroll bar.
+ (frame_inhibit_resize, adjust_frame_size)
+ (frame_windows_min_size): Add declarations.
+ (Qscroll_bar_height, Qhorizontal_scroll_bars)
+ (x_set_scroll_bar_default_height, x_set_left_fringe)
+ (x_set_right_fringe, x_set_vertical_scroll_bars)
+ (x_set_horizontal_scroll_bars, x_set_scroll_bar_width)
+ (x_set_scroll_bar_height): Add external declarations.
+ * frame.c: (frame_inhibit_resize, frame_windows_min_size)
+ (adjust_frame_size): New functions.
+ (make_frame): Initial horizontal_scroll_bars field.
+ Use SET_FRAME_LINES. Don't allow horizontal scroll bar in
+ minibuffer window.
+ (make_initial_frame, make_terminal_frame): No horizontal scroll
+ bar in initial and terminal frames. Use adjust_frame_size.
+ (Fframe_total_cols): Fix doc-string.
+ (Fframe_total_lines, Fscroll_bar_height): New Lisp functions.
+ (Fset_frame_height, Fset_frame_width, Fset_frame_size):
+ Rewrite using adjust_frame_size.
+ (Qscroll_bar_height, Qhorizontal_scroll_bars)
+ (Qframe_windows_min_size): New symbols.
+ (x_set_frame_parameters): Remove call of check_frame_size.
+ (x_report_frame_params): Return scroll_bar_height value.
+ (x_set_left_fringe, x_set_right_fringe): New functions.
+ (adjust_frame_height, x_set_internal_border_width)
+ (x_set_fringe_width): Remove.
+ (x_set_internal_border_width, x_set_vertical_scroll_bars)
+ (x_set_scroll_bar_width, x_set_right_divider_width)
+ (x_set_bottom_divider_width): Rewrite using adjust_frame_size.
+ (x_set_horizontal_scroll_bars, x_set_scroll_bar_height):
+ New functions.
+ (x_figure_window_size): Rewrite to make frame display the
+ expected number of lines.
+ (Vdefault_frame_scroll_bars): Rewrite doc-string.
+ (Vdefault_frame_horizontal_scroll_bars)
+ (Vframe_initial_frame_tool_bar_height)
+ (frame_inhibit_implied_resize): New variables.
+ * fringe.c (compute_fringe_widths): Remove.
+ * gtkutil.h (YG_SB_MIN, YG_SB_MAX, YG_SB_RANGE): Define.
+ (xg_create_horizontal_scroll_bar)
+ (xg_update_horizontal_scrollbar_pos)
+ (xg_set_toolkit_horizontal_scroll_bar_thumb)
+ (xg_get_default_scrollbar_height)
+ (xg_clear_under_internal_border): Extern.
+ * gtkutil.c (xg_frame_resized): Don't call
+ do_pending_window_change.
+ (xg_frame_set_char_size): Use adjust_frame_size.
+ (style_changed_cb): Call update_theme_scrollbar_height and
+ x_set_scroll_bar_default_height.
+ (x_wm_set_size_hint): Don't call check_frame_size.
+ (update_theme_scrollbar_height)
+ (xg_get_default_scrollbar_height)
+ (xg_create_horizontal_scroll_bar)
+ (xg_update_horizontal_scrollbar_pos)
+ (xg_set_toolkit_horizontal_scroll_bar_thumb): New functions.
+ (xg_create_scroll_bar): Set horizontal slot of bar.
+ (xg_initialize): Call update_theme_scrollbar_height.
+ (xg_clear_under_internal_border): No more static.
+ * insdel.c (adjust_suspend_auto_hscroll): New function.
+ (adjust_markers_for_delete, adjust_markers_for_insert)
+ (adjust_markers_for_replace): Call adjust_suspend_auto_hscroll.
+ * keyboard.c (readable_events, discard_mouse_events)
+ (make_lispy_event): Handle horizontal scroll bar click events.
+ (Fsuspend_emacs): When changing the size of a tty frame do not
+ pass height of menu bar.
+ (Qbefore_handle, Qhorizontal_handle, Qafter_handle, Qleft)
+ (Qright, Qleftmost, Qrightmost): New symbols.
+ * menu.c (Fx_popup_dialog): Use FRAME_TOTAL_LINES instead of
+ FRAME_LINES.
+ * minibuf.c (read_minibuf): Initialize suspend_auto_hscroll.
+ * nsfns.m (x_set_internal_border_width): New function.
+ * nsterm.m (ns_draw_fringe_bitmap, ns_set_vertical_scroll_bar):
+ Remove extended fringe code.
+ (x_set_window_size, x_new_font): Don't call
+ compute_fringe_widths.
+ * term.c (Fresume_tty): When changing the size of a tty frame do
+ not pass height of menu bar.
+ (clear_tty_hooks, set_tty_hooks):
+ Clear horizontal_scroll_bar_hook.
+ (init_tty): Frame has no horizontal scroll bars.
+ * termhooks.h (enum scroll_bar_part): Add scroll_bar_move_ratio,
+ scroll_bar_before_handle, scroll_bar_horizontal_handle,
+ scroll_bar_after_handle, scroll_bar_left_arrow,
+ scroll_bar_right_arrow, scroll_bar_to_leftmost and
+ scroll_bar_to_rightmost entries.
+ (enum event_kind): Add HORIZONTAL_SCROLL_BAR_CLICK_EVENT
+ (struct terminal): Add set_horizontal_scroll_bar_hook.
+ * w32console.c (initialize_w32_display):
+ Clear horizontal_scroll_bar_hook.
+ * w32fns.c (x_set_mouse_color): Use FRAME_W32_DISPLAY instead of
+ FRAME_X_DISPLAY.
+ (x_clear_under_internal_border, x_set_internal_border_width):
+ New functions.
+ (x_set_menu_bar_lines): Rewrite using frame_inhibit_resize.
+ Set windows_or_buffers_changed when adding the menu bar.
+ (x_set_tool_bar_lines): Rewrite using adjust_frame_size.
+ (x_change_tool_bar_height, x_set_scroll_bar_default_height)
+ (w32_createhscrollbar): New functions.
+ (w32_createscrollbar): Rename to w32_createvscrollbar.
+ (w32_createwindow): Init WND_HSCROLLBAR_INDEX.
+ (w32_name_of_message): Replace WM_EMACS_CREATESCROLLBAR by
+ WM_EMACS_CREATEVSCROLLBAR and WM_EMACS_CREATEHSCROLLBAR.
+ Add WM_EMACS_SHOWCURSOR.
+ (w32_wnd_proc): Handle WM_HSCROLL case. In WM_WINDOWPOSCHANGING
+ case do not artificially impose WM size hints.
+ Handle WM_EMACS_SHOWCURSOR case. Replace WM_EMACS_CREATESCROLLBAR case
+ by WM_EMACS_CREATEVSCROLLBAR and WM_EMACS_CREATEHSCROLLBAR
+ cases.
+ (my_create_tip_window): Replace WND_SCROLLBAR_INDEX by
+ WND_VSCROLLBAR_INDEX and WND_HSCROLLBAR_INDEX.
+ (unwind_create_frame_1): Remove.
+ (Fx_create_frame): Make both scrollbars the system standard
+ width and height. Use official field of frame structure to
+ inhibit running window-configuration-change-hook.
+ (x_create_tip_frame): Call SET_FRAME_LINES and change_frame_size
+ pixelwise. Handle frame's official field.
+ (w32_frame_parm_handlers): Remove x_set_fringe_width
+ entries. Add x_set_scroll_bar_height,
+ x_set_horizontal_scroll_bars, x_set_left_fringe and
+ x_set_right_fringe.
+ * w32inevt.c (resize_event, maybe_generate_resize_event): Do not
+ pass height of menu bar to change_frame_size.
+ * w32menu.c (set_frame_menubar): Rewrite using
+ frame_inhibit_resize.
+ * w32term.h (struct w32_display_info):
+ Add horizontal_scroll_bar_cursor and cursor_display_counter.
+ (struct scroll_bar): Add horizontal.
+ (HORIZONTAL_SCROLL_BAR_INSIDE_HEIGHT)
+ (HORIZONTAL_SCROLL_BAR_LEFT_RANGE)
+ (HORIZONTAL_SCROLL_BAR_INSIDE_WIDTH)
+ (HORIZONTAL_SCROLL_BAR_LEFT_BORDER)
+ (HORIZONTAL_SCROLL_BAR_RIGHT_BORDER)
+ (HORIZONTAL_SCROLL_BAR_TOP_BORDER)
+ (HORIZONTAL_SCROLL_BAR_BOTTOM_BORDER)
+ (HORIZONTAL_SCROLL_BAR_MIN_HANDLE): New macros.
+ (WM_EMACS_CREATEVSCROLLBAR, WM_EMACS_CREATEHSCROLLBAR):
+ Define instead of WM_EMACS_CREATESCROLLBAR.
+ (WND_VSCROLLBAR_INDEX, WND_HSCROLLBAR_INDEX): Define instead of
+ WND_SCROLLBAR_INDEX.
+ * w32term.c (horizontal_scroll_bar_min_handle)
+ (horizontal_scroll_bar_left_border)
+ (horizontal_scroll_bar_right_border): New integers.
+ (x_set_frame_alpha): Replace x_highlight_frame by
+ w32_focus_frame.
+ (x_window_to_scroll_bar): New argument "type". Update callers
+ accordingly.
+ (w32_set_horizontal_scroll_bar_thumb)
+ (x_horizontal_scroll_bar_report_motion)
+ (w32_set_horizontal_scroll_bar)
+ (w32_horizontal_scroll_bar_handle_click)
+ (x_horizontal_scroll_bar_report_motion): New functions.
+ (w32_mouse_position): Discriminate horizontal and vertical
+ scrollbar cases.
+ (my_create_scrollbar): Replace with two new functions
+ my_create_vscrollbar and my_create_hscrollbar.
+ (x_scroll_bar_create): New argument "horizontal".
+ Update callers accordingly.
+ (x_scroll_bar_remove, w32_condemn_scroll_bars)
+ (w32_redeem_scroll_bar, x_scroll_bar_clear): Handle horizontal
+ scroll bar case.
+ (w32_read_socket): Handle WM_HSCROLL cae.
+ (x_new_font): Don't recompute fringe widths.
+ Use frame_inhibit_resize. Calculate new menu bar height iff we
+ build without toolkit. Always clear under internal border.
+ (x_set_window_size): Don't check frame size or recompute
+ fringes. Reset fullscreen status before applying sizes.
+ Always resize as requested by pixelwise argument. Don't call
+ do_pending_window_change.
+ (x_wm_set_size_hint): Add call for FRAME_SCROLL_BAR_AREA_HEIGHT.
+ (w32_initialize_display_info): Initialize dpyinfo's
+ horizontal_scroll_bar_cursor entry.
+ (w32_create_terminal): Add set_horizontal_scroll_bar_hook.
+ (w32_initialize): Init horizontal_scroll_bar_min_handle and
+ horizontal_scroll_bar_left_border.
+ (w32fullscreen_hook): Intermittently resize window to normal
+ when switching from fullscreen to maximized state.
+ (run_window_configuration_change_hook): Don't run it if frame is
+ not official yet.
+ (unwind_change_frame): Remove.
+ (Fset_window_configuration): Rewrite using frame's official field.
+ * widget.c (set_frame_size): Don't call compute_fringe_widths.
+ (EmacsFrameSetCharSize): Obey frame_inhibit_resize.
+ * window.h (struct window): New fields old_pointm,
+ horizontal_scroll_bar, horizontal_scroll_bar_type, hscroll_whole,
+ scroll_bar_height and suspend_auto_hscroll.
+ (wset_horizontal_scroll_bar, wset_horizontal_scroll_bar_type):
+ New functions.
+ (sanitize_window_sizes): Extern.
+ (MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P, WINDOW_PSEUDO_P)
+ (WINDOW_TOPMOST_P, WINDOW_HAS_HORIZONTAL_SCROLL_BAR)
+ (WINDOW_CONFIG_SCROLL_BAR_HEIGHT)
+ (WINDOW_CONFIG_SCROLL_BAR_LINES)
+ (WINDOW_SCROLL_BAR_LINES, WINDOW_SCROLL_BAR_AREA_HEIGHT):
+ New macros.
+ (WINDOW_LEFT_FRINGE_COLS, WINDOW_RIGHT_FRINGE_COLS)
+ (WINDOW_FRINGE_COLS, WINDOW_FRINGE_EXTENDED_P): Remove macros.
+ (WINDOW_VERTICAL_SCROLL_BAR_TYPE)
+ (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT)
+ (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT)
+ (WINDOW_HAS_VERTICAL_SCROLL_BAR): Minor rewrite.
+ (WINDOW_BOX_HEIGHT_NO_MODE_LINE, WINDOW_BOX_TEXT_HEIGHT)
+ (WINDOW_SCROLL_BAR_AREA_Y): Count in scroll bar height.
+ * window.c (wset_old_pointm, Fwindow_scroll_bar_height)
+ (Fwindow_old_point, sanitize_window_sizes): New functions.
+ (Qwindow_sanitize_window_sizes): New symbol.
+ (window_body_height): Count in horizontal scroll bar.
+ (set_window_hscroll, Fscroll_left, Fscroll_right):
+ Set suspend_auto_hscroll slot.
+ (Fwindow_inside_edges): Count fringes pixelwise.
+ (coordinates_in_window, Fcoordinates_in_window_p):
+ Consider horizontal scroll bar.
+ (check_frame_size, adjust_window_margins): Remove functions and
+ corresponding calls.
- (set_window_buffer): Initialize old_pointm and horizontal scroll
- bars.
++ (set_window_buffer): Initialize old_pointm and horizontal scroll bars.
+ (temp_output_buffer_show): Reset hscroll related fields.
+ Initialize old_pointm.
+ (make_parent_window): Initialize old_pointm.
+ (make_window): Initialize old_pointm, horizontal scroll bar type,
+ and scroll bar height.
+ (resize_frame_windows): Don't count top margin in new sizes.
+ Don't use safe sizes when shrinking a frame; let the window
+ manager do the clipping.
+ (Fsplit_window_internal): Inherit horizontal scroll bar type and
+ height.
+ (Fdelete_window_internal): Unchain old_pointm marker.
+ (window_scroll_pixel_based, Fscroll_other_window):
+ Adjust old_pointm.
+ (Fwindow_text_width, Fwindow_text_height): New argument
+ "pixelwise".
+ (struct saved_window): New fields, old_pointm, hscroll_whole,
+ suspend_auto_hscroll, scroll_bar_height and
+ horizontal_scroll_bar_type.
+ (Fset_window_configuration, save_window_save): Set new fields of
+ saved_window.
+ (apply_window_adjustment): Don't call adjust_window_margins.
+ (set_window_margins): Don't change margins if new sizes don't
+ fit into window.
+ (set_window_scroll_bars): New argument "horizontal_type".
+ Handle horizontal scroll bars. Don't change scroll bars if they
+ don't fit into window.
+ (Fset_window_scroll_bars): New argument "horizontal_type".
+ (Fwindow_scroll_bars): Return values for horizontal scroll bars.
+ (compare_window_configurations): Compare horizontal scroll bar
+ settings.
+ * xdisp.c (window_text_bottom_y, window_box_height): Count in
+ horizontal scroll bar height.
+ (pixel_to_glyph_coords, init_xdisp): Use FRAME_TOTAL_LINES
+ instead of FRAME_LINES.
+ (remember_mouse_glyph): Case ON_SCROLL_BAR changed to
+ ON_VERTICAL_SCROLL_BAR.
+ (with_echo_area_buffer): Initialize old_pointm.
+ (with_echo_area_buffer_unwind_data): Store old_pointm values in
+ vector.
+ (unwind_with_echo_area_buffer): Handle old_pointm.
+ (update_tool_bar): Set do_update when the tool bar window has at
+ least one line (since this is what the user sets).
+ (MAX_FRAME_TOOL_BAR_HEIGHT): Remove macro.
+ (redisplay_tool_bar): Return early when toolbar has zero lines.
+ Call x_change_tool_bar_height. Don't use max_tool_bar_height.
+ (hscroll_window_tree): Handle suspension of auto_hscroll and
+ old_pointm.
+ (set_horizontal_scroll_bar): New function.
+ (redisplay_window): Set ignore_mouse_drag_p when tool bar has
+ more than one line. Handle horizontal scroll bars.
+ (note_mouse_highlight): Handle horizontal scrol bars.
+ (expose_frame): Set dimensions of XRectangle from frame's text
+ sizes.
+ (Vvoid_text_area_pointer): Update doc-string.
+ * xfns.c (x_set_menu_bar_lines): Use adjust_frame_size.
+ (x_change_tool_bar_height, x_set_scroll_bar_default_height)
+ (x_set_internal_border_width): New functions.
+ (x_set_tool_bar_lines): Call x_change_tool_bar_height.
+ (unwind_create_frame_1): Remove.
+ (Fx_create_frame): Handle horizontal scroll bars. Use official
+ field of frame structure to inhibit running
+ window-configuration-change-hook.
+ (x_create_tip_frame): Call SET_FRAME_LINES and change_frame_size
+ pixelwise. Handle frame's official field.
+ (x_frame_parm_handlers): Add x_set_scroll_bar_height,
+ x_set_horizontal_scroll_bars, x_set_left_fringe,
+ x_set_right_fringe.
+ * xmenu.c (update_frame_menubar, free_frame_menubar):
+ Use adjust_frame_size.
+ * xterm.h (struct x_display_info):
+ Add horizontal_scroll_bar_cursor and Xatom_Horizontal_Scrollbar
+ slots.
+ (struct scroll_bar): Add horizontal slot.
+ (HORIZONTAL_SCROLL_BAR_INSIDE_HEIGHT)
+ (HORIZONTAL_SCROLL_BAR_LEFT_RANGE)
+ (HORIZONTAL_SCROLL_BAR_INSIDE_WIDTH): New macros.
+ (HORIZONTAL_SCROLL_BAR_LEFT_BORDER)
+ (HORIZONTAL_SCROLL_BAR_RIGHT_BORDER)
+ (HORIZONTAL_SCROLL_BAR_TOP_BORDER)
+ (HORIZONTAL_SCROLL_BAR_BOTTOM_BORDER)
+ (HORIZONTAL_SCROLL_BAR_MIN_HANDLE): Define.
+ (x_clear_under_internal_border): Remove.
+ * xterm.c (XTmouse_position): Handle horizontal scroll bars.
+ (x_window_to_scroll_bar): New argument TYPE. Update callers.
+ (x_send_scroll_bar_event, x_scroll_bar_create): New arguments
+ HORIZONTAL. Update callers.
+ (horizontal_action_hook_id): New action hook id.
+ (x_horizontal_scroll_bar_to_input_event)
+ (x_create_horizontal_toolkit_scroll_bar)
+ (xt_horizontal_action_hook)
+ (x_set_toolkit_horizontal_scroll_bar_thumb)
+ (XTset_horizontal_scroll_bar, x_net_wm_state)
+ (x_horizontal_scroll_bar_report_motion): New functions.
+ (xg_scroll_callback, x_scroll_bar_handle_click):
+ Handle horizontal scroll bars.
+ (SCROLL_BAR_HORIZONTAL_NAME): Define.
+ (XTset_vertical_scroll_bar): Attempt to clear areas not covered
+ by scroll bar.
+ (XTcondemn_scroll_bars, XTredeem_scroll_bar): Rewrite.
+ Handle horizontal scroll bars.
+ (handle_one_xevent): Handle horizontal scroll bar events.
+ Call x_net_wm_state.
+ (x_set_window_size_1, x_wm_set_size_hint): Don't call
+ check_frame_size.
+ (x_set_window_size): Don't call check_frame_size and
+ do_pending_window_change.
+ (x_term_init): Init horizontal_scroll_bar_cursor display info.
+ (x_create_terminal): Add set_horizontal_scroll_bar_hook.
+ (x_scroll_bar_set_handle): Add some checks when calling
+ x_clear_area.
+
+2014-07-26 Paul Eggert <address@hidden>
+
+ Revert previous change.
+ There is certainly nothing wrong with writing code like 'lo <= i
+ && i <= hi', even if LO happens to a constant. There isn't even
+ anything wrong in general with writing 'a <= b' if A happens to
+ be a constant. At any rate stylistic changes shouldn't
+ be done like this without discussion.
+
+2014-07-26 Andreas Schwab <address@hidden>
+
+ * alloc.c (xnmalloc, xnrealloc, xpalloc, make_save_value)
+ (Fgarbage_collect): Reorder conditions that are written backwards.
+ * data.c (cons_to_unsigned): Likewise.
+ * dispnew.c (update_frame_1, sit_for): Likewise.
+ * fileio.c (file_offset): Likewise.
+ * filelock.c (read_lock_data, lock_file): Likewise.
+ * fns.c (larger_vector, make_hash_table, Fmake_hash_table):
+ Likewise.
+ * font.c (font_intern_prop, font_style_symbolic): Likewise.
+ * lisp.h (FIXNUM_OVERFLOW_P): Likewise.
+ * lread.c (read1): Likewise.
+ * minibuf.c (read_minibuf_noninteractive): Likewise.
+ * nsterm.m (x_set_frame_alpha): Likewise.
+ * process.c (wait_reading_process_output): Likewise.
+ * region-cache.c (delete_cache_boundaries): Likewise.
+ * xterm.c (x_set_frame_alpha): Likewise.
+
+2014-07-25 Paul Eggert <address@hidden>
+
+ * dispextern.h, xdisp.c (hourglass_shown_p, hourglass_atimer):
+ Now static.
+
+2014-07-26 Dmitry Antipov <address@hidden>
+
+ * atimer.c (set_alarm) [HAVE_ITIMERSPEC]: Use TIMER_ABSTIME
+ because atimer expiration is absolute rather than relative.
+
+2014-07-25 Eli Zaretskii <address@hidden>
+
+ * w32term.h (current_popup_menu, menubar_in_use):
+ Move declarations from w32term.c.
+
+2014-07-25 Martin Rudalics <address@hidden>
+
+ * w32fns.c (menubar_in_use): No more static.
+ * w32term.c (current_popup_menu, menubar_in_use): Declare.
+
+2014-07-25 Dmitry Antipov <address@hidden>
+
+ Move hourglass machinery to RIF.
+ * dispextern.h (struct redisplay_interface): New members
+ show_hourglass and hide_hourglass. Indent comments.
+ (show_hourglass, hide_hourglass): Remove prototypes.
+ * nsterm.m (show_hourgass, hide_hourglass): Refactor to ...
+ (ns_show_hourglass, ns_hide_hourglass): ... new no-ops.
+ (ns_redisplay_interface): Add them.
+ * w32fns.c (show_hourglass, hide_hourglass): Refactor to ...
+ * w32term.c (w32_show_hourglass, w32_hide_hourglass): ... these.
+ (w32_arrow_cursor): New function to hack around non-GUI frames.
+ (w32_redisplay_interface): Add new functions.
+ * w32term.h (w32_arror_cursor): Add prototype.
+ * xdisp.c (show_hourglass): New function, refactored out from
+ platform-dependent code.
+ (cancel_hourglass): Now call to RIF function.
+ * xfns.c (show_hourglass, hide_hourglass): Refactor to ...
+ * xterm.c (x_show_hourglass, x_hide_hourglass): ... these.
+ (x_redisplay_interface): Add new functions.
+
+2014-07-24 Dmitry Antipov <address@hidden>
+
+ Fix error reported by Angelo Graziosi <address@hidden> in
+ <http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00274.html>
+ and complete previous change.
+ * frame.c (adjust_frame_height): New function.
+ (Fset_frame_height, Fset_frame_size): Use it.
+ (x_set_frame_parameters): Take frame top margin into account.
+
+2014-07-23 Dmitry Antipov <address@hidden>
+
+ * frame.c (Fset_frame_height): Take frame top margin into account.
+ Incorrect behavior was reported by Martin Rudalics <address@hidden> in
+ <http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00258.html>
+
+2014-07-22 Dmitry Antipov <address@hidden>
+
+ * xterm.h (struct x_output) [USE_X_TOOLKIT || USE_GTK]: Define
+ menubar_height as such. Tweak comment.
+ [USE_LUCID && USE_TOOLKIT_SCROLL_BARS]: Likewise for
+ scroll_bar_top_shadow_pixel and scroll_bar_bottom_shadow_pixel.
+ All related users changed.
+ (FRAME_MENUBAR_HEIGHT) [!USE_X_TOOLKIT && !USE_GTK]: No-op.
+ * xterm.c (handle_one_xevent):
+ * gtkutil.c (xg_event_is_for_menubar):
+ * xfns.c (x_window) [USE_X_TOOLKIT]:
+ * xmenu.c (set_frame_menubar, free_frame_menubar):
+ Prefer to use FRAME_MENUBAR_HEIGHT.
+
+2014-07-21 Dmitry Antipov <address@hidden>
+
+ * frame.c (Fframe_parameters): Always report frame height without
+ menu and tool bar lines.
+
+2014-07-21 Jan Djärv <address@hidden>
* nsterm.m (applicationDidFinishLaunching:): Call
antialiasThresholdDidChange, register for antialias changes (Bug#17534).
diff --cc src/nsmenu.m
index a90cb97,323b287..0e8b68b
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@@ -1136,11 -1185,10 +1139,13 @@@ update_frame_tool_bar (struct frame *f
if (FRAME_TOOLBAR_HEIGHT (f) < 0) // happens if frame is fullscreen.
FRAME_TOOLBAR_HEIGHT (f) = 0;
+ if (oldh != FRAME_TOOLBAR_HEIGHT (f))
+ [view updateFrameSize:YES];
if (view->wait_for_tool_bar && FRAME_TOOLBAR_HEIGHT (f) > 0)
+ {
+ view->wait_for_tool_bar = NO;
[view setNeedsDisplay: YES];
+ }
unblock_input ();
}
diff --cc src/window.h
index ea5dddc,4c76f0b..4e4c65b
--- a/src/window.h
+++ b/src/window.h
@@@ -519,7 -468,8 +519,7 @@@ wset_next_buffers (struct window *w, Li
#define WINDOW_FRAME_COLUMN_WIDTH(W) \
(FRAME_COLUMN_WIDTH (WINDOW_XFRAME ((W))))
- /* Return the canonical column width of the frame of window W. */
+ /* Return the canonical line height of the frame of window W. */
-
#define WINDOW_FRAME_LINE_HEIGHT(W) \
(FRAME_LINE_HEIGHT (WINDOW_XFRAME ((W))))
diff --cc test/ChangeLog
index 48e01ca,4f7f068..a09c6f7
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,16 -1,32 +1,27 @@@
-2014-11-15 Fabián Ezequiel Gallina <address@hidden>
++2014-11-16 Fabián Ezequiel Gallina <address@hidden>
+
+ * automated/python-tests.el (python-indent-dedenters-8): New test
+ for Bug#18432.
+
-2014-11-15 Fabián Ezequiel Gallina <address@hidden>
++2014-11-16 Fabián Ezequiel Gallina <address@hidden>
+
+ * automated/python-tests.el (python-indent-region-1)
+ (python-indent-region-2, python-indent-region-3)
+ (python-indent-region-4, python-indent-region-5): New tests.
+
-2014-11-08 Michael Albinus <address@hidden>
+2014-11-08 Stefan Monnier <address@hidden>
- Backport Tramp changes from trunk.
+ * automated/bytecomp-tests.el (bytecomp-tests--warnings): New tests.
+ * automated/cl-lib-tests.el: Rename from cl-lib.el.
- * automated/tramp-tests.el (tramp-remote-process-environment):
- Declare.
- (tramp--test-enabled): Ignore errors.
- (tramp--instrument-test-case): Extend docstring. Print debug
- buffer in any case.
- (tramp-test15-copy-directory): Skip for tramp-smb.el.
- (tramp-test21-file-links): Use `file-truename' for directories.
- (tramp-test26-process-file): Extend test according to Bug#17815.
- (tramp-test27-start-file-process, tramp-test28-shell-command):
- Retrieve process output more robustly.
- (tramp-test29-vc-registered): Set $BZR_HOME.
- (tramp--test-check-files): Extend test with `substitute-in-file-name'.
- (tramp-test30-special-characters): Skip for tramp-adb.el,
- tramp-gvfs.el and tramp-smb.el. Add further file names.
+2014-10-28 Ulf Jasper <address@hidden>
+
+ * automated/libxml-tests.el: New file.
+
+2014-10-22 Noam Postavsky <address@hidden>
+
+ * test/automated/process-tests.el (process-test-quoted-batfile):
+ New test.
2014-10-20 Glenn Morris <address@hidden>