]> code.delx.au - gnu-emacs/commitdiff
Merge from emacs-24; up to 2014-07-22T06:37:31Z!yamaoka@jpl.org
authorGlenn Morris <rgm@gnu.org>
Thu, 9 Oct 2014 04:23:09 +0000 (21:23 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 9 Oct 2014 04:23:09 +0000 (21:23 -0700)
1  2 
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/frames.texi
lisp/ChangeLog
lisp/faces.el
lisp/frame.el
lisp/term.el
src/w32term.c

index 59d4280e789af1a90389d036fac58a36e6e16d61,af7db4bf383048712639df8ba29bda44a0774750..cafe925dec0418c519e203d35464e84238d1d132
@@@ -1,4 -1,9 +1,9 @@@
 -2014-10-06  Glenn Morris  <rgm@gnu.org>
++2014-10-09  Glenn Morris  <rgm@gnu.org>
+       * package.texi (Package Menu): The package list was changed to not
+       say "unsigned" any more.
 -2014-10-04  Glenn Morris  <rgm@gnu.org>
 +2014-10-05  Glenn Morris  <rgm@gnu.org>
  
        * misc.texi (Sorting):
        * search.texi (Query Replace): Markup fixes.
index 4d4d0b529cc1f376e752555f016e4ab17172532a,2ebd1bc9e52908a6e044e654696b6518bb90a7c2..ba95d11399a4265204374829453c461ee4eda43b
@@@ -1,19 -1,20 +1,36 @@@
 -2014-10-08  Eli Zaretskii  <eliz@gnu.org>
+ 2014-10-09  Glenn Morris  <rgm@gnu.org>
+       * frames.texi (Multiple Terminals): Copyedits.
++2014-10-09  Eli Zaretskii  <eliz@gnu.org>
+       * frames.texi (Multiple Terminals): Improve the description of X
+       display names.  Add index entries.
+       (Basic Parameters): Add a cross-reference to where X display names
+       are described.
+       (Position Parameters): Mention that positional parameters of the
+       form (+ POS) can be negative if they are on a non-primary monitor
+       of a multi-monitor display.  (Bug#18636)
+       (Creating Frames): Mention that on multi-monitor displays the
+       frame might be positioned differently than specified by the frame
+       parameters alist.
 +2014-10-08  Leo Liu  <sdl.web@gmail.com>
 +
 +      * streams.texi (Output Functions): Document new argument ENSURE to
 +      terpri.  (Bug#18652)
 +
 +2014-10-04  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * display.texi (Scroll Bars): Add description of horizontal scroll
 +      bars and associated functions.
 +      * frames.texi (Layout Parameters): Add horizontal scroll bar
 +      entries.  Remove paragraph on "combined fringe widths".
 +      * windows.texi (Window Sizes): Describe affects of horizontal
 +      scroll bars on window layout and sizes.  Fix description of
 +      window-full-height-p.
 +      (Resizing Windows): Mention horizontal scroll bar.
 +
  2014-10-04  Glenn Morris  <rgm@gnu.org>
  
        * commands.texi (Generic Commands): Copyedits.
Simple merge
diff --cc lisp/ChangeLog
index c8c6f61cdcfbcfa61136535a9ed211ba98a63530,6831c0efb421e76166dbe1f1a8a29e829ea2d2d0..ef31fc2ead08398d9dfc7b76e174145df6d3d4a0
 -2014-10-08  Eli Zaretskii  <eliz@gnu.org>
+ 2014-10-09  Glenn Morris  <rgm@gnu.org>
+       * frame.el (display-monitor-attributes-list): Doc tweaks.
 -2014-10-06  Martin Rudalics  <rudalics@gmx.at>
++2014-10-09  Eli Zaretskii  <eliz@gnu.org>
+       * faces.el (display-grayscale-p): Mention in the doc string that
+       the argument can be either a display name or a frame.
+       * frame.el (display-pixel-height, display-pixel-width)
+       (display-mm-height, display-mm-width, display-backing-store)
+       (display-save-under, display-planes, display-color-cells)
+       (display-visual-class, display-monitor-attributes-list)
+       (display-screens): Mention in the doc string that the argument can
+       be either a display name or a frame.  Improve the docs of the
+       monitor attributes.  (Bug#18636)
++2014-10-09  Martin Rudalics  <rudalics@gmx.at>
+       * term.el (term-window-width): Subtract 1 from the width when
+       any fringe has zero width, not just the right fringe.  (Bug#18601)
 +2014-10-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * frame.el (make-frame): Use t rather than nil for `w' (bug#18653).
 +
 +2014-10-08  Leo Liu  <sdl.web@gmail.com>
 +
 +      * emacs-lisp/cl-extra.el (cl-fresh-line): New function.
 +
 +2014-10-08  Glenn Morris  <rgm@gnu.org>
 +
 +      * calendar/cal-x.el (calendar-dedicate-diary):
 +      Drop support for recently deleted aliases.
 +
 +2014-10-08  Leo Liu  <sdl.web@gmail.com>
 +
 +      * progmodes/cfengine.el (cfengine3-make-syntax-cache):
 +      Always return a syntax.  Replace call-process-shell-command with
 +      process-file.  Ensure cfengine-mode-syntax-functions-regex is
 +      always set.  Ensure cache when cfengine-cf-promises fails.
 +      (Bug#18620)
 +
 +2014-10-07  Glenn Morris  <rgm@gnu.org>
 +
 +      * font-lock.el (font-lock-fontify-buffer): Fix interactive-only markup.
 +
 +2014-10-07  Wilson Snyder  <wsnyder@wsnyder.org>
 +
 +      Sync with upstream verilog-mode revision c075a492.
 +      * progmodes/verilog-mode.el (verilog-mode-version): Bump.
 +      (verilog-menu): Add AUTOINSERTLAST.
 +      (verilog-no-indent-begin-re): When `verilog-indent-begin-after-if'
 +      is nil, fix indenting initial/final to match always statements, bug825.
 +      Reported by Tim Clapp.
 +      (verilog-extended-complete-re): Fix indentation of DPI-C imports,
 +      bug557.  Reported by ZeDong Mao and Jason Forkey.
 +      (verilog-read-decls): Fix parsing typed interfaces.
 +      Fix AUTOINOUTMODPORT missing types.  Reported by Stephan Bourduas.
 +      (verilog-auto-arg-ports): Fix verilog-auto-arg-format single.
 +      (verilog-auto-output-every): Add regexp to AUTOOUTPUTEVERY, bug793.
 +      Reported by Pierre-David Pfister.
 +      (verilog-auto-insert-lisp): Doc fix.
 +      (verilog-auto-insert-last, verilog-auto): Add AUTOINSERTLAST to
 +      allow post-AUTO user fixups, bug826.  Reported by Dennis Muhlestein.
 +      (verilog-sk-ovm-class, verilog-sk-uvm-object)
 +      (verilog-sk-uvm-component): Fix missing string keyword in class
 +      skeletons, bug824.  Reported by eldad faruhi.
 +
 +2014-10-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * term/w32-win.el: Move all code from 32-common-fns.el here.
 +      (gui-select-text, gui-selection-value): Use w32 handlers in the w32
 +      console as well (bug#18629).
 +      * w32-common-fns.el: Remove.
 +      * loadup.el: Don't load w32-common-fns.el.
 +      * w32-fns.elc: Don't require w32-common-fns.
 +
 +      * icomplete.el: Move Iswitchb autoload here.  Much simpler.
 +      * obsolete/iswitchb.el (iswitchb-mode): Use normal autoload cookie.
 +      Remove redundant obsolescence thingy.
 +      * loadup.el: Don't load obsolete/loaddefs.el.
 +      * Makefile.in (obsolete-autoloads): Remove.
 +      (AUTOGENEL): Remove obsolete/loaddefs.el.
 +
 +2014-10-06  Glenn Morris  <rgm@gnu.org>
 +
 +      * Makefile.in (obsolete-autoloads): Write to a separate file,
 +      to workaround autoloads bug.  (Bug#17407)
 +      (AUTOGENEL): Add obsolete/loaddefs.el.
 +      * loadup.el: Load obsolete/loaddefs.el if present.
 +      * subr.el (do-after-load-evaluation):
 +      Don't warn about obsolete/loaddefs.el.
 +
 +      * menu-bar.el (menu-bar-games-menu): Remove landmark.
 +      It has zero relationship to a game.
 +
 +2014-10-06  Leo Liu  <sdl.web@gmail.com>
 +
 +      * imenu.el (imenu): Re-write for clarity.
 +
 +2014-10-06  Glenn Morris  <rgm@gnu.org>
 +
 +      Remove calendar code obsolete since at least version 23.1.
 +      * calendar/cal-bahai.el (calendar-absolute-from-bahai)
 +      (calendar-print-bahai-date, calendar-bahai-prompt-for-date)
 +      (calendar-goto-bahai-date, list-bahai-diary-entries)
 +      (mark-bahai-calendar-date-pattern, mark-bahai-diary-entries)
 +      (insert-bahai-diary-entry, insert-monthly-bahai-diary-entry)
 +      (insert-yearly-bahai-diary-entry):
 +      * calendar/cal-china.el (chinese-calendar-time-zone)
 +      (chinese-calendar-location-name)
 +      (chinese-calendar-daylight-time-offset)
 +      (chinese-calendar-standard-time-zone-name)
 +      (chinese-calendar-daylight-time-zone-name)
 +      (chinese-calendar-daylight-savings-starts)
 +      (chinese-calendar-daylight-savings-ends)
 +      (chinese-calendar-daylight-savings-starts-time)
 +      (chinese-calendar-daylight-savings-ends-time)
 +      (chinese-calendar-celestial-stem)
 +      (chinese-calendar-terrestrial-branch)
 +      (calendar-absolute-from-chinese, calendar-print-chinese-date)
 +      (calendar-goto-chinese-date):
 +      * calendar/cal-coptic.el (calendar-absolute-from-coptic)
 +      (calendar-print-coptic-date, coptic-prompt-for-date)
 +      (calendar-goto-coptic-date, calendar-absolute-from-ethiopic)
 +      (calendar-print-ethiopic-date, calendar-goto-ethiopic-date):
 +      * calendar/cal-french.el (calendar-absolute-from-french)
 +      (calendar-print-french-date, calendar-goto-french-date):
 +      * calendar/cal-hebrew.el (diary-sabbath-candles-minutes)
 +      (calendar-absolute-from-hebrew, calendar-print-hebrew-date)
 +      (hebrew-calendar-yahrzeit, calendar-goto-hebrew-date)
 +      (holiday-rosh-hashanah-etc, holiday-hanukkah)
 +      (holiday-passover-etc, holiday-tisha-b-av-etc)
 +      (list-hebrew-diary-entries, mark-hebrew-calendar-date-pattern)
 +      (mark-hebrew-diary-entries, insert-hebrew-diary-entry)
 +      (insert-monthly-hebrew-diary-entry)
 +      (insert-yearly-hebrew-diary-entry, list-yahrzeit-dates)
 +      (diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha)
 +      (diary-sabbath-candles):
 +      * calendar/cal-islam.el (calendar-absolute-from-islamic)
 +      (calendar-print-islamic-date, calendar-goto-islamic-date)
 +      (list-islamic-diary-entries, mark-islamic-calendar-date-pattern)
 +      (mark-islamic-diary-entries, insert-islamic-diary-entry)
 +      (insert-monthly-islamic-diary-entry)
 +      (insert-yearly-islamic-diary-entry):
 +      * calendar/cal-iso.el (calendar-absolute-from-iso)
 +      (calendar-print-iso-date, calendar-iso-read-args)
 +      (calendar-goto-iso-date, calendar-goto-iso-week):
 +      * calendar/cal-julian.el (calendar-absolute-from-julian)
 +      (calendar-print-julian-date, calendar-goto-julian-date)
 +      (calendar-absolute-from-astro, calendar-print-astro-day-number)
 +      (calendar-goto-astro-day-number):
 +      * calendar/cal-mayan.el (calendar-print-mayan-date)
 +      (calendar-next-haab-date, calendar-previous-haab-date)
 +      (calendar-next-tzolkin-date, calendar-previous-tzolkin-date)
 +      (calendar-next-calendar-round-date)
 +      (calendar-previous-calendar-round-date)
 +      (calendar-absolute-from-mayan-long-count)
 +      (calendar-goto-mayan-long-count-date):
 +      * calendar/cal-move.el (scroll-calendar-left)
 +      (scroll-calendar-right, scroll-calendar-left-three-months)
 +      (scroll-calendar-right-three-months):
 +      * calendar/cal-persia.el (calendar-absolute-from-persian)
 +      (calendar-print-persian-date, persian-prompt-for-date)
 +      (calendar-goto-persian-date):
 +      * calendar/cal-x.el (calendar-after-frame-setup-hooks):
 +      * calendar/calendar.el (view-diary-entries-initially)
 +      (mark-diary-entries-in-calendar, calendar-today-face)
 +      (diary-face, holiday-face, view-calendar-holidays-initially)
 +      (mark-holidays-in-calendar, initial-calendar-window-hook)
 +      (today-visible-calendar-hook, today-invisible-calendar-hook)
 +      (hebrew-diary-entry-symbol, islamic-diary-entry-symbol)
 +      (bahai-diary-entry-symbol, american-date-diary-pattern)
 +      (european-date-diary-pattern, european-calendar-display-form)
 +      (american-calendar-display-form, holidays-in-diary-buffer)
 +      (all-hebrew-calendar-holidays, all-christian-calendar-holidays)
 +      (all-islamic-calendar-holidays, all-bahai-calendar-holidays)
 +      (fancy-diary-buffer, increment-calendar-month)
 +      (extract-calendar-month, extract-calendar-day)
 +      (extract-calendar-year, exit-calendar, calendar-date-is-legal-p)
 +      (mark-visible-calendar-date, calendar-version):
 +      * calendar/diary-lib.el (diary-button-face, sexp-diary-entry-symbol)
 +      (diary-display-hook, list-diary-entries-hook)
 +      (mark-diary-entries-hook, nongregorian-diary-listing-hook)
 +      (nongregorian-diary-marking-hook, print-diary-entries-hook)
 +      (abbreviated-calendar-year, number-of-diary-entries)
 +      (view-other-diary-entries, add-to-diary-list)
 +      (include-other-diary-files, simple-diary-display)
 +      (fancy-diary-display, print-diary-entries, mark-diary-entries)
 +      (mark-sexp-diary-entries, mark-included-diary-files)
 +      (mark-calendar-days-named, mark-calendar-month)
 +      (mark-calendar-date-pattern, sort-diary-entries)
 +      (list-sexp-diary-entries, make-diary-entry, insert-diary-entry)
 +      (insert-weekly-diary-entry, insert-monthly-diary-entry)
 +      (insert-yearly-diary-entry, insert-anniversary-diary-entry)
 +      (insert-block-diary-entry, insert-cyclic-diary-entry)
 +      (fancy-diary-font-lock-keywords, fancy-diary-display-mode):
 +      * calendar/holidays.el (general-holidays, oriental-holidays)
 +      (local-holidays, other-holidays, hebrew-holidays)
 +      (christian-holidays, islamic-holidays, bahai-holidays)
 +      (solar-holidays, list-calendar-holidays)
 +      (check-calendar-holidays, mark-calendar-holidays)
 +      (filter-visible-calendar-holidays):
 +      * calendar/lunar.el (calendar-phases-of-moon, phases-of-moon)
 +      (diary-phases-of-moon): Remove obsolete aliases.
 +      * calendar/cal-menu.el (cal-menu-load-hook): Remove obsolete hook.
 +      * calendar/cal-x.el (calendar-one-frame-setup)
 +      (calendar-only-one-frame-setup, calendar-two-frame-setup):
 +      Remove obsolete functions.
 +      (cal-x-load-hook): Remove obsolete hook.
 +      * calendar/calendar.el (european-calendar-style):
 +      Remove obsolete variable.
 +      (calendar-date-style): No longer consult european-calendar-style.
 +      * calendar/calendar.el (european-calendar, american-calendar):
 +      Remove obsolete commands.
 +      * calendar/calendar.el (calendar-for-loop): Remove obsolete macro.
 +      * calendar/diary-lib.el (diary-face): Remove obsolete variable.
 +      (diary-font-lock-date-forms, diary-fancy-font-lock-keywords):
 +      Use the face `diary' instead of the variable `diary-face'.
 +      * calendar/holidays.el (hebrew-holidays-1, hebrew-holidays-2)
 +      (hebrew-holidays-3, hebrew-holidays-4): Remove obsolete variables.
 +      * calendar/icalendar.el (icalendar--date-style): Remove function.
 +      Replace all uses with calendar-date-style.
 +      * textmodes/remember.el (calendar-date-style): Declare.
 +      (remember-diary-convert-entry):
 +      No longer consult european-calendar-style.
 +
  2014-10-05  Leo Liu  <sdl.web@gmail.com>
  
        * imenu.el (imenu-default-goto-function): Fix typo.
diff --cc lisp/faces.el
Simple merge
diff --cc lisp/frame.el
Simple merge
diff --cc lisp/term.el
Simple merge
diff --cc src/w32term.c
Simple merge