From: Glenn Morris Date: Sun, 13 Jan 2013 20:03:01 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-10T20:27:33Z!eggert@cs.ucla.edu X-Git-Tag: emacs-24.3.90~173^2~7^2~308 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c0511b57692c7a27d3632c34653dab5cfed629ef;p=emacs.git Merge from emacs-24; up to 2012-12-10T20:27:33Z!eggert@cs.ucla.edu --- c0511b57692c7a27d3632c34653dab5cfed629ef diff --cc ChangeLog index f306aefbd1b,05d15b7dc36..dabe3b3d7db --- a/ChangeLog +++ b/ChangeLog @@@ -1,23 -1,7 +1,27 @@@ -2013-01-10 Glenn Morris ++2013-01-13 Glenn Morris + + * make-dist: Add options for xz compression and no compression. + +2013-01-12 Paul Eggert + + Enable conservative stack scanning for all architectures. + Suggested by Stefan Monnier in + . + * configure.ac (GC_MARK_STACK): Remove. + +2013-01-11 Paul Eggert + + * lib/getopt_.h: Remove trailing CRs that crept in. + +2013-01-11 Eli Zaretskii + + * lib/getopt_.h: Regenerate. + +2013-01-10 Paul Eggert + + Merge from gnulib, incorporating: + 2013-01-09 stdlib: port to Solaris 2.6 + 2013-01-04 Glenn Morris * info/dir: Add htmlfontify. diff --cc doc/misc/ChangeLog index 4412b1c3c2c,e3ee947fe24..95c7ac7b233 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,8 -1,15 +1,19 @@@ + 2013-01-13 Bastien Guerry + + * org.texi (Installation): Simplify. + + 2013-01-13 François Allisson (tiny change) + + * org.texi (Handling links): Update the mention to the obsolete + variable `org-link-to-org-use-id' with a mention to the newer + variable `org-id-link-to-org-use-id'. Mention the need to load + the org-id library. + -2013-01-08 Bastien Guerry +2013-01-10 Michael Albinus + + * tramp.texi (Default Host): Introduce `tramp-default-host-alist'. + +2013-01-09 Bastien Guerry * org.texi (Pushing to MobileOrg): Add footnote about using symbolic links in `org-directory'. diff --cc lisp/ChangeLog index 371665b5a57,63dd9d0a093..5c7e8c3e6a8 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,207 -1,8 +1,212 @@@ -2013-01-10 Fabián Ezequiel Gallina ++2013-01-13 Fabián Ezequiel Gallina + + * progmodes/python.el (python-nav-end-of-statement): Fix + cornercase when handling multiline strings. + +2013-01-13 Richard Stallman + + * mail/sendmail.el (mail-position-on-field): Add doc string. + + * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Get + current message boundaries and pass them to + message-forward-make-body-mime. Minor style changes. + +2013-01-13 Eli Zaretskii + + * cus-start.el (all): Avoid warnings about + scroll-bar-adjust-thumb-portion on platforms where it is not + defined. + +2013-01-11 Jan Djärv + + * cus-start.el (all): Add scroll-bar-adjust-thumb-portion. + +2013-01-13 Stefan Monnier + + * jit-lock.el (jit-lock-debug-mode): New minor mode. + (jit-lock--debug-fontifying): New var. + (jit-lock--debug-fontify): New function. + * subr.el (condition-case-unless-debug): Don't prevent catching the + error, just let the debbugger run. + * emacs-lisp/timer.el (timer-event-handler): Don't prevent debugging + timer code and don't drop errors silently. + +2013-01-12 Michael Albinus + + * autorevert.el (auto-revert-notify-watch-descriptor): Give it + `permanent-local' property. + (auto-revert-notify-handler): Use `file-equal-p'. + +2013-01-12 Eli Zaretskii + + * autorevert.el (auto-revert-notify-handler): Fix filtering of + file notification by ACTION. For filtering by file name, compare + only the non-directory part of the file name. + +2013-01-12 Stefan Monnier + + * autorevert.el: Use cl-lib instead of cl. + + * vc/vc-bzr.el (vc-bzr--sanitize-header): New function (bug#13307). + (vc-bzr-checkin): Use it. + * vc/log-edit.el (log-edit-extract-headers): Don't presume FUNCTION + will preserve match-data. + +2013-01-11 Felix H. Dahlke + + * progmodes/js.el: Fix multiline declarations's indentation (bug#8576). + (js--declaration-keyword-re): New var. + (js--multi-line-declaration-indentation): New function. + (js--proper-indentation): Use it. + +2013-01-11 Aaron S. Hawley + + * calc/calc.el (calc-highlight-selections-with-faces) + (calc-dispatch): + * comint.el (comint-history-isearch-message): + * emacs-lisp/edebug.el (edebug-read, edebug-eval-defun): + * ffap.el (ffap-string-at-point-region, ffap-next) + (ffap-string-at-point, ffap-string-around) + (ffap-copy-string-as-kill, ffap-highlight-overlay) + (ffap-literally): + * font-lock.el (font-lock-keywords-alist) + (font-lock-removed-keywords-alist): + * help-mode.el (help-xref-symbol-regexp): + * info.el (Info-find-emacs-command-nodes): + * international/mule.el (add-to-coding-system-list): + * isearch.el (isearch-message-function, isearch-fail-pos): + * misearch.el (multi-isearch-next-buffer-function): + * newcomment.el (comment-box): + * printing.el (pr-txt-printer-alist, pr-ps-printer-alist) + (pr-setting-database): + * progmodes/cc-fonts.el (c-font-lock-keywords-3) + (c++-font-lock-keywords-3, objc-font-lock-keywords-3) + (java-font-lock-keywords-3, idl-font-lock-keywords-3) + (pike-font-lock-keywords-3): + * progmodes/compile.el (compile): + * progmodes/etags.el (tags-table-files) + (tags-table-files-function, tags-included-tables-function): + * progmodes/gdb-mi.el (gdb, gdb-setup-windows) + (gdb-restore-windows): + * ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces) + (ps-n-up-filling-database): + * server.el (server-buffer, server-log): + * simple.el (newline, delete-backward-char, delete-forward-char) + (minibuffer-history-isearch-message, kill-line, track-eol) + (temporary-goal-column): + * textmodes/flyspell.el (flyspell-mark-duplications-flag) + (flyspell-default-deplacement-commands): + * textmodes/ispell.el (ispell-accept-output): + * textmodes/sgml-mode.el (html-tag-help): + * vc/compare-w.el (compare-ignore-whitespace) + (compare-ignore-case, compare-windows-dehighlight): + * vc/diff.el (diff): + * whitespace.el (whitespace-point) + (whitespace-font-lock-refontify, whitespace-bob-marker) + (whitespace-eob-marker): Fix ambiguous doc string cross-reference(s). + +2013-01-11 Michael Albinus + + * autorevert.el (top): Require 'cl in order to pacify byte compiler. + (auto-revert-notify-rm-watch): Ignore errors. + (auto-revert-notify-add-watch): Ignore errors. Use '(modify) for + inotify, and '(size last-write-time) for w32notify. + Set buffer-local `auto-revert-use-notify' to nil when adding a file + watch fails - this is a fallback to the file modification check. + (auto-revert-notify-event-p, auto-revert-notify-event-descriptor) + (auto-revert-notify-event-action) + (auto-revert-notify-event-file-name): New defuns. + (auto-revert-notify-handler): Use them. Implement first + plausibility checks. + (auto-revert-handler): Handle also `auto-revert-tail-mode'. + +2013-01-11 Julien Danjou + + * color.el (color-rgb-to-hsv): Fix conversion computing in case min and + max are almost equal. Also return the correct value for V which is + already between 0 and 1. + +2013-01-11 Dmitry Antipov + + * emacs-lisp/ert.el (ert-run-test): Use point-max-marker. + +2013-01-11 Eli Zaretskii + + * autorevert.el (auto-revert-notify-rm-watch) + (auto-revert-notify-add-watch): Fix typos in w32notify function + names. + +2013-01-10 Michael Albinus + + * autorevert.el (auto-revert-notify-enabled): Move up. + (auto-revert-use-notify): New defcustom. + (auto-revert-mode, global-auto-revert-mode) + (auto-revert-notify-add-watch, auto-revert-handler) + (auto-revert-buffers): Use `auto-revert-use-notify' instead of + `auto-revert-notify-enabled'. + +2013-01-10 Elias Pipping + + * files.el (auto-mode-alist): Use doc-view for djvu files (bug#13164). + * doc-view.el (doc-view-document->bitmap): + Use doc-view-single-page-converter-function instead of + single-page-converter arg; adjust callers. + +2013-01-10 Feng Li (tiny change) + + * progmodes/which-func.el (which-function): Understand Semantic's use + of overlays in imenu--index-alist. + +2013-01-10 Wolfgang Jenkner + + * man.el: Handle different "man -k" behaviors (bug#13160). Use utf-8. + (Man-man-k-use-anchor): New var. + (Man-parse-man-k): New function. + (Man-completion-table): Use it. + (man): Flush the completion cache between uses. + +2013-01-10 Michael Albinus + + * autorevert.el: Add file watch support. + (auto-revert-notify-enabled): New defconst. + (auto-revert-notify-watch-descriptor-hash-list) + (auto-revert-notify-watch-descriptor) + (auto-revert-notify-modified-p): New defvars. + (auto-revert-notify-rm-watch, auto-revert-notify-add-watch) + (auto-revert-notify-handler): New defuns. + (auto-revert-mode, global-auto-revert-mode): Remove file watches + when mode is disabled. + (auto-revert-handler): Check for `auto-revert-notify-modified-p'. + (auto-revert-buffers): Add file watches for active buffers. + +2013-01-10 Dmitry Antipov + + * cus-start.el (toplevel): Only allow float values for + scroll-up-aggressively and scroll-down-aggressively. + Allow any number for line-spacing. + +2013-01-10 Stefan Monnier + + * doc-view.el (doc-view-pdfdraw-program): Allow "pdfdraw" name. + (doc-view-pdf->png-converter-function): Use mupdf if available. + (doc-view-djvu->png-converter-function) + (doc-view-ps->png-converter-function): Remove. + (doc-view--image-file-pattern): Replace doc-view--image-file-extension. + (doc-view-goto-page, doc-view-convert-current-doc, doc-view-display) + (doc-view-already-converted-p): Adjust accordingly. + (doc-view-mode-p): Simplify. + (doc-view-enlarge): Use setq-local. + (doc-view-pdf->png-converter-ghostscript) + (doc-view-djvu->png-converter-ddjvu) + (doc-view-pdf->png-converter-mupdf): Rework to call + doc-view-start-process directly. + (doc-view-pdf/ps->png): Simplify accordingly. + (doc-view-pdf->png-1, doc-view-djvu->png-1): Remove. + (doc-view-document->bitmap): Rename from doc-view-document->png. + (doc-view-convert-current-doc): Merge pdf and djvu cases. + (doc-view-set-slice-from-bounding-box): Fix completion table. + (doc-view-mode): Use add-hook for after-revert-hook. + 2013-01-10 Glenn Morris * emacs-lisp/authors.el (authors-ignored-files) diff --cc lisp/org/ChangeLog index 3a575f60414,b6d196ecf54..56a76c7d680 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@@ -1,13 -1,43 +1,43 @@@ - 2013-01-09 Achim Gratz + 2013-01-13 Bastien Guerry + + * org-compat.el (org-condition-case-unless-debug): Delete. + + * org-odt.el (org-odt-cleanup-xml-buffers): Use + `condition-case' instead of `org-condition-case-unless-debug', + which is now deleted. + + * org-capture.el (org-capture-templates-contexts): + * org-agenda.el (org-agenda-custom-commands-contexts): + Docstring fix. + + * org.el (org-get-tags-at): Remove duplicate inherited tags. + + * org-agenda.el (org-agenda-show-inherited-tags): Allow to be set + to 'always or to a list of agenda types. + (org-agenda-finalize): Rework conditions under which inherited + tags should be made available even when not displayed. + (org-search-view, org-agenda-get-todos) + (org-agenda-get-timestamps, org-agenda-get-sexps) + (org-agenda-get-progress, org-agenda-get-scheduled) + (org-agenda-get-blocks): Use new possible values of + `org-agenda-show-inherited-tags'. - * org-compat.el (org-define-obsolete-function-alias) - (org-define-obsolete-variable-alias): Introduce new compatibility - macros to obsolete functions and variables. + * org.el (org-open-at-point): Fix opening all links at point. - * org-agenda.el, org-clock.el, org-id.el, org-lparse.el: - * org-protocol.el, org.el: - Use `org-define-obsolete-{function,variable}-alias' instead - of `define-obsolate{function,variable}-alias'. + * org-agenda.el (org-get-entries-from-diary): Turn off + `diary-file-name-prefix' instead of + `diary-file-name-prefix-function', the former is checked before + the latter. + + * org.el (org-edit-special): Check for table.el before checking + for Org tables. + + 2013-01-13 Michael Albinus + + * ob-eval.el (org-babel-shell-command-on-region): Use + `executable-find' for local `shell-file-name'. + -2013-01-08 Achim Gratz ++2013-01-09 Achim Gratz * org-faces.el: Define face alias mode-line for XEmacs (it's called modeline there). diff --cc src/ChangeLog index 526d3db3dbf,a673c5f6123..9096b904171 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,146 -1,27 +1,159 @@@ + 2013-01-13 Jan Djärv + + * nsfont.m (LCD_SMOOTHING_MARGIN): New define. + (nsfont_draw): Remove disabling of LCD smoothing. + (ns_glyph_metrics): Add LCD_SMOOTHING_MARGIN to bearings to fix + Bug#11484 with LCD smoothing on. + -2013-01-11 Rainer Orth (tiny change) - - * gtkutil.c (xg_initialize): Backport from trunk. - Add ifdef HAVE_FREETYPE around x_last_font_name (Bug#13403). - -2013-01-11 Paul Eggert - - Backport typo fix from trunk, for AIX (Bug#13408). - * eval.c (mark_backtrace) [BYTE_MARK_STACK]: Remove stray '*'. - This follows up on the 2012-09-29 patch that removed indirection - for the 'function' field. Reported by Sergey Vinokurov in - . ++2013-01-13 Paul Eggert + + Fix SIGDANGER handlers, for AIX (Bug#13408). + * sysdep.c.c (handle_danger_signal, deliver_danger_signal) [SIGDANGER]: + Move handlers here from emacs.c; they were out of place. + +2013-01-11 Jan Djärv + + * xterm.c (syms_of_xterm): Adjust documentation for + scroll-bar-adjust-thumb-portion. + +2012-12-31 Adam Sjøgren (tiny change) + + * xterm.c (scroll-bar-adjust-thumb-portion): New variable to + determine whether scroll bar thumb size should be adjusted or + not. Use variable for MOTIF. + + * gtkutil.c (scroll-bar-adjust-thumb-portion): Use variable for + GTK. + +2013-01-13 Jan Djärv + + * nsterm.m (keyDown:): Set processingCompose to NO if an emacs key + event is generated. + (doCommandBySelector:): Set processingCompose to NO. + + * nsfont.m (ns_findfonts): Add block/unblock_input calls. + Remove check for fkeys count > zero, block/unblock fixes the real bug. + (nsfont_list_family): Add block/unblock_input calls. + (nsfont_open): Move block_input earlier. Add unblock_input before early + return. + (nsfont_draw): Add block/unblock_input calls. + +2013-01-12 Dmitry Antipov + + * indent.c (Fvertical_motion): Remove now-incorrect GCPROs + for old_charpos and old_bytepos. + +2013-01-12 Paul Eggert + + Fix bug with set-time-zone-rule and LOCALTIME_CACHE (Bug#13415). + * editfns.c (set_time_zone_rule) [LOCALTIME_CACHE]: + Clear tzvalbuf_in_environ if this workaround is in effect. + Problem and fix reported by Kazuhiro Ito. + +2013-01-11 Aaron S. Hawley + + * insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix + ambiguous doc string cross-reference(s). + + * keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous + doc string cross-reference(s). + + * window.c (Fwindow_point, syms_of_window): Fix ambiguous doc + string cross-reference(s). + +2013-01-11 Dmitry Antipov + + Avoid unnecessary byte position calculation for the gap movement. + Since all users of move_gap do CHAR_TO_BYTE for other purposes + anyway, all of them should use move_gap_both instead. + * lisp.h (move_gap): Remove prototype. + * insdel.c (move_gap): Remove. + (move_gap_both): Add eassert. + * editfns.c (Ftranspose_regions): Tweak to use move_gap_both. + * xml.c (parse_region): Likewise. + +2013-01-11 Paul Eggert + + emacsclient -t should not suspend Emacs server (Bug#13387) + * lisp.h, sysdep.c (block_tty_out_signal, unblock_tty_out_signal): + New functions. + * term.c (init_tty): Use them instead of rolling our own code. + * sysdep.c (tcsetpgrp_without_stopping): Likewise. Here, this + switches from 'signal' to 'pthread_sigmask', which is safer in + multithreaded applications. + * term.c (Fresume_tty): Don't bother dissociating if O_IGNORE_CTTY, + which has already arranged for that. + (dissociate_if_controlling_tty): If setsid fails, fall back on TIOCNOTTY. + This is the main part of the bug fix. + +2013-01-10 Rainer Orth (tiny change) + + * gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around + x_last_font_name (Bug#13403). + +2013-01-10 Dmitry Antipov + + Omit buffer_slot_type_mismatch and use generic predicates to enforce + the type of per-buffer values where appropriate. + * lisp.h (struct Lisp_Buffer_Objfwd): Rename slottype member to + predicate, which is how it's really used now. Adjust comment. + * buffer.h (buffer_slot_type_mismatch): Remove prototype. + * buffer.c (buffer_slot_type_mismatch): Remove. + (DEFVAR_PER_BUFFER, defvar_per_buffer): Rename type argument to + predicate. Adjust comment. + (syms_of_buffer): Use Qsymbolp for major-mode. Use Qintegerp for + fill-column, left-margin, tab-width, buffer-saved-size, + left-margin-width, right-margin-width, left-fringe-width, + right-fringe-width, scroll-bar-width and buffer-display-count. + Use Qstringp for default-directory, buffer-file-name, + buffer-file-truename and buffer-auto-save-file-name. Use Qfloatp for + scroll-up-aggressively and scroll-down-aggressively. Use Qnumberp for + line-spacing. + * data.c (store_symval_forwarding): Adjust to call the predicate. + +2013-01-09 Juanma Barranquero + + * w32.c (get_name_and_id, acl_set_file): + * w32term.c (w32fullscreen_hook): Remove unused local variables. + +2013-01-09 Dmitry Antipov + + * lisp.h (make_gap_1): New prototype. + * buffer.h (GAP_BYTES_DFL, GAP_BYTES_MIN): New macros for the special + gap size values. + * editfns.c (Fbuffer_size): Rename from Fbufsize to fit the common + naming convention. + (syms_of_editfns): Adjust defsubr. Drop commented-out obsolete code. + * insdel.c (make_gap_larger): Use GAP_BYTES_DFL. Adjust comment. + (make_gap_smaller): Use GAP_BYTES_MIN. Adjust comment. + (make_gap_1): New function to adjust the gap of any buffer. + * coding.c (coding_alloc_by_making_gap): Use it. + * buffer.c (compact_buffer): Likewise. Use BUF_Z_BYTE, BUF_GAP_SIZE, + GAP_BYTES_DFL and GAP_BYTES_MIN. Adjust comment. + +2013-01-08 Juri Linkov + + * xfaces.c (tty_supports_face_attributes_p): Return 0 for the case + of (supports :underline (:style wave)). (Bug#13000) + +2013-01-08 Aaron S. Hawley + + * undo.c (Fprimitive_undo): Move to simple.el. + (syms_of_undo): Remove declarations for Sprimitive_undo. + +2013-01-08 Stefan Monnier + + * keyboard.c (echo_add_key): Rename from echo_add_char. + +2013-01-06 Chong Yidong + + * keyboard.c (echo_add_char): New function, factored out from + echo_char. Don't add a space if the previous echo string was + empty (Bug#13255). + (echo_char): Use it. + (read_key_sequence): When echoing mock input, ensure that the + trailing dash is properly added. + 2013-01-05 Eli Zaretskii * xdisp.c (dump_glyph): Align glyph data better. Use "pD" instead diff --cc src/nsfont.m index 39f9e2ef3bc,207b6a40483..5039f0c9013 --- a/src/nsfont.m +++ b/src/nsfont.m @@@ -44,11 -44,11 +44,12 @@@ Author: Adrian Robert (arobert@cogsci.u #endif #define NSFONT_TRACE 0 + #define LCD_SMOOTHING_MARGIN 2 extern Lisp_Object Qns; -extern Lisp_Object Qnormal, Qbold, Qitalic, Qcondensed, Qexpanded; +extern Lisp_Object Qnormal, Qbold, Qitalic; static Lisp_Object Qapple, Qroman, Qmedium; +static Lisp_Object Qcondensed, Qexpanded; extern Lisp_Object Qappend; extern float ns_antialias_threshold; extern int ns_tmp_flags;