GitLab

 vc.el (vc-coding-system-inherit-eol): New defvar.
 (vc-coding-system-for-diff): Use it to decide whether to inherit
 from the file the EOL format for reading the diffs of that file.

 so compressed attachments are not compressed again.

 See http://lists.gnu.org/archive/html/emacs-devel/2010-07/msg00599.html

now that unicode is used (Bug#6594).

* gtkutil.c (xg_event_is_for_menubar): New function (Bug#6499).

* gtkutil.h (xg_event_is_for_menubar): Declare.

* xfns.c (x_menubar_window_to_frame): Take XEvent as second parameter
instead of Window.  Call xg_event_is_for_menubar when
USE_GTK (Bug#6499).

* xmenu.c (x_activate_menubar): Revert previous fix for Bug#6499,
i.e. don't put back ButtonRelease (Bug#6608).

* xterm.c (handle_one_xevent): Pass event to x_menubar_window_to_frame.

* xterm.h (x_menubar_window_to_frame): Second parameter is XEvent*.

 w32fns.c (x_set_foreground_color): Fix setting the cursor color
 when it's the same as the old foreground.

* calendar/calendar.el (calendar-week-end-day): New function.
* calendar/cal-tex.el (cal-tex-cursor-month): Remove unused vars.
Respect calendar-week-start-day.  (Bug#6606)
(cal-tex-insert-day-names, cal-tex-insert-blank-days)
(cal-tex-insert-blank-days-at-end): Respect calendar-week-start-day.
(cal-tex-first-blank-p, cal-tex-last-blank-p): Simplify, and
respect calendar-week-start-day.

(Bug#6593).

* lisp/progmodes/python.el (python-font-lock-keywords): Add Python 2.7
builtins (BufferError, BytesWarning, WindowsError; callables
bin, bytearray, bytes, format, memoryview, next, print; __package__).

* play/zone.el (zone-fall-through-ws): Fix next-line -> forward-line fallout.

* help.el (describe-key): Print up-event using key-description.

* mouse.el (mouse-appearance-menu): Add docstring.

	* keyboard.c: Remove duplicate <setjmp.h>.
	(read_key_sequence): Remove volatile qualifiers.

* dispextern.h (FRINGE_HEIGHT_BITS): New define.
(struct glyph_row): New members left_fringe_offset and
right_fringe_offset.

* xterm.c (x_draw_fringe_bitmap): Don't clip bottom aligned bitmap
specially.
* w32term.c (w32_draw_fringe_bitmap): Likewise.
* nsterm.m (ns_draw_fringe_bitmap): Likewise.

* fringe.c (draw_fringe_bitmap_1): Don't clip bitmap here.
Take account of	bitmap offset.
(draw_window_fringes): Take account of window vscroll.
(update_window_fringes): Likewise.  Extend top-aligned top indicator
or bottom-aligned bottom indicator to adjacent rows if it doesn't fit
in one row.  Don't set redraw_fringe_bitmaps_p outside row comparison.
Set left_fringe_offset and right_fringe_offset (Bug#5634, Bug#6325).

Suggested by Andy Moreton <andrewjmoreton@gmail.com>.

(zeroconf-service-resolver-handler): Use
`dbus-byte-array-to-string'.
(zeroconf-publish-service): Use `dbus-string-to-byte-array'.

* xmenu.c (x_activate_menubar): Send Press/Release for Gtk+ to avoid
grab on just Press (Bug#6499).

* frame.c (Qtooltip): New var.
(delete_frame): Use it.  Fix faulty if statement.  Don't update
mode line for tooltip frames.  Suggested by Martin Rudalics.

* xfns.c (x_create_tip_frame):
* w32fns.c (x_create_tip_frame): Use it.

* lisp/vc-dir.el (vc-dir-update): Obey the noinsert argument in all
cases that cause insertion.
(vc-dir-resynch-file): Tell vc-dir-update to avoid inserting files
with a nil state.

* xftfont.c (xftfont_open): Check font width one by one also when
spacing is dual.

* ftfont.c (ftfont_open): Ditto.

* generic-x.el (bat-generic-mode): Fix regexp for command line
switches (Bug#5719).

* htmlfontify.el (hfy-face-attr-for-class): Use `append' instead
of `nconc' (Bug#6239).

* bookmark.el (bookmark-bmenu-2-window)
(bookmark-bmenu-other-window)
(bookmark-bmenu-other-window-with-mouse): Remove unnecessary
bindings of bookmark-automatically-show-annotations (Bug#6515).

 arc-mode.el (archive-zip-extract): Don't quote the file name on
 MS-Windows and MS-DOS.  (Bug#6467, Bug#6144)

* xdisp.c (next_element_from_image): Ensure that after-strings are
read the next time we hit handle_stop (Bug#1336).

* text.texi (Undo): Clarify command loop behavior (Bug#2433).
* commands.texi (Command Overview): Mention undo-boundary call.

* ada-mode.texi, auth.texi, autotype.texi, calc.texi, cc-mode.texi:
* dired-x.texi, ebrowse.texi, ede.texi, edt.texi, eieio.texi:
* emacs-mime.texi, epa.texi, erc.texi, eshell.texi, eudc.texi:
* flymake.texi, gnus.texi, info.texi, mairix-el.texi, message.texi:
* newsticker.texi, org.texi, pgg.texi, rcirc.texi, reftex.texi:
* remember.texi, sasl.texi, semantic.texi, ses.texi, smtpmail.texi:
* speedbar.texi, tramp.texi, url.texi, viper.texi, widget.texi:
* woman.texi:
Start direntry descriptions in column 32, per Texinfo convention.
Make them end with a period.

* lisp/comint.el (make-comint, make-comint-in-buffer): Mention return
value in the docstrings.  (Bug#6498)

* lisp/bs.el (bs-mode-font-lock-keywords): Remove "by" from Dired
pattern, since it is not present when using some non-default switches.