]> code.delx.au - gnu-emacs/log
gnu-emacs
9 years ago'libxml-parse(html|xml)-region': new optional param 'discard-comments'.
Ulf Jasper [Fri, 21 Nov 2014 15:31:30 +0000 (16:31 +0100)]
'libxml-parse(html|xml)-region': new optional param 'discard-comments'.

* doc/lispref/text.texi (Parsing HTML/XML): Document new optional parameter
'discard-comments' of 'libxml-parse(html|xml)-region'.

* src/xml.c (parse_region): Take care of new optional parameter
'discard-comments' of 'libxml-parse(html|xml)-region'.
(Flibxml_parse_html_region, Flibxml_parse_xml_region): New
optional parameter 'discard-comments'.

* test/automated/libxml-tests.el
(libxml-tests--data-comments-preserved): Renamed from
'libxml-tests--data'.
(libxml-tests--data-comments-discarded): New.
(libxml-tests): Check whether 'libxml-parse-xml-region' is
discarding comments correctly.

9 years agoFix bug that produced spurious nil state.
Eric S. Raymond [Fri, 21 Nov 2014 12:29:51 +0000 (07:29 -0500)]
Fix bug that produced spurious nil state.

9 years agoFix bug #19084 with 'C-x v +' in *vc-change-log* buffers.
Eli Zaretskii [Fri, 21 Nov 2014 10:14:32 +0000 (12:14 +0200)]
Fix bug #19084 with 'C-x v +' in *vc-change-log* buffers.

 lisp/vc/vc.el (vc-deduce-fileset): Support invocation from
 *vc-change-log* buffer.

9 years agoFix bug #1702 with missing feature in arc-mode.el.
Matthew Leach [Fri, 21 Nov 2014 10:08:00 +0000 (12:08 +0200)]
Fix bug #1702 with missing feature in arc-mode.el.

 lisp/arc-mode.el (archive-visit-single-files): New.
 (archive-mode): Visit file if archive contains a single file.

9 years agoFix the build of the Emacs User manual.
Eli Zaretskii [Fri, 21 Nov 2014 09:32:53 +0000 (11:32 +0200)]
Fix the build of the Emacs User manual.

 doc/emacs/maintaining.texi (Version Control Systems): Move "@end itemize"
 past the last @item.  Fix a typo (reported by H. Dieter Wilhelm
 <dieter@duenenhof-wilhelm.de>).

9 years agoFix bug #19136 with a typo in a vc.el comment.
Ulrich Mueller [Fri, 21 Nov 2014 09:21:50 +0000 (11:21 +0200)]
Fix bug #19136 with a typo in a vc.el comment.

 lisp/vc/vc.el: Fix a typo in the commentary.

9 years agoClean up after SRC support merge (typo fixes).
Eric S. Raymond [Fri, 21 Nov 2014 03:44:07 +0000 (22:44 -0500)]
Clean up after SRC support merge (typo fixes).

9 years agoSupport for SRC in VC mode.
Eric S. Raymond [Thu, 20 Nov 2014 22:57:22 +0000 (17:57 -0500)]
Support for SRC in VC mode.

9 years agoRemove editable argument from VC's backend checkout methods.
Eric S. Raymond [Thu, 20 Nov 2014 08:52:24 +0000 (03:52 -0500)]
Remove editable argument from VC's backend checkout methods.

Alters vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el, vc/vc-git.el,
vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el, vc/vc-sccs.el,
vc/vc-svn.el, vc/vc.el.

where this matters (which is only in SCCS and RCS) files are now always
checked out editable. This may actually have been dynamically true
already - it looks like the vc-next-action code evolved past visiting
the other case. Tested with RCS.

9 years agoRemove never-used rev argument from VC's backend checkin methods.
Eric S. Raymond [Thu, 20 Nov 2014 07:37:06 +0000 (02:37 -0500)]
Remove never-used rev argument from VC's backend checkin methods.

Alters vc/vc-arch.el, vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el,
vc/vc-git.el, vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el,
vc/vc-sccs.el, vc/vc-svn.el, vc/vc.el.

Only the RCS, SCCS, and CVS back ends tried to do anything with it,
and that code was never exercised. Chiseling away the cruft of
decades...

9 years agobuild-aux/msys-to-w32: Simplify implementation and docstring.
Dani Moncayo [Wed, 19 Nov 2014 20:15:32 +0000 (21:15 +0100)]
build-aux/msys-to-w32: Simplify implementation and docstring.

* build-aux/msys-to-w32: Simplify implementation and docstring;
Paths starting with '%emacs_dir%' are just considered relative.

9 years agoAdd missing bug numbers to last few eww changes
Lars Magne Ingebrigtsen [Wed, 19 Nov 2014 19:14:19 +0000 (20:14 +0100)]
Add missing bug numbers to last few eww changes

9 years ago* eww.texi (Basics): Document `eww-history-limit'.
Ivan Shmakov [Wed, 19 Nov 2014 19:09:30 +0000 (20:09 +0100)]
* eww.texi (Basics): Document `eww-history-limit'.

9 years agoAdd NEWS entry for define-advice
Leo Liu [Wed, 19 Nov 2014 18:18:01 +0000 (02:18 +0800)]
Add NEWS entry for define-advice

* NEWS: Mention new macro define-advice.

9 years ago* net/eww.el (eww-render): Remove a no-op :title setting.
Lars Magne Ingebrigtsen [Wed, 19 Nov 2014 17:41:17 +0000 (18:41 +0100)]
* net/eww.el (eww-render): Remove a no-op :title setting.

9 years ago(eww-reload): Reload the page in the right buffer.
Ivan Shmakov [Wed, 19 Nov 2014 17:37:18 +0000 (18:37 +0100)]
(eww-reload): Reload the page in the right buffer.

9 years ago(eww-history-limit): New variable.
Ivan Shmakov [Wed, 19 Nov 2014 17:28:19 +0000 (18:28 +0100)]
(eww-history-limit): New variable.

* net/eww.el (eww-history-limit): New variable.
(eww-save-history): Use it.

9 years ago* net/eww.el (eww-desktop-misc-data): Use `cl-remove-duplicates'.
Lars Magne Ingebrigtsen [Wed, 19 Nov 2014 17:22:45 +0000 (18:22 +0100)]
* net/eww.el (eww-desktop-misc-data): Use `cl-remove-duplicates'.

9 years agoAdd desktop support to eww
Ivan Shmakov [Wed, 19 Nov 2014 17:21:58 +0000 (18:21 +0100)]
Add desktop support to eww

* net/eww.el (eww-desktop-remove-duplicates)
(eww-restore-desktop, eww-restore-reload-prompt): New variables.
(eww-mode): Set up desktop mode.
(eww-desktop-data-save, eww-desktop-data-1)
(eww-desktop-history-duplicate, eww-desktop-misc-data)
(eww-restore-desktop): New functions.

9 years agoFix bug #19101 with log-view-mode set in the wrong buffer.
Eli Zaretskii [Wed, 19 Nov 2014 16:11:05 +0000 (18:11 +0200)]
Fix bug #19101 with log-view-mode set in the wrong buffer.

 lisp/vc/vc.el (vc-log-internal-common): Turn on log-view-mode in the
 correct buffer.  (Bug#19101)

9 years agovc-git: Support `diff-switches'.
Rüdiger Sonderfeld [Wed, 19 Nov 2014 02:55:00 +0000 (03:55 +0100)]
vc-git: Support `diff-switches'.

Fix bug#19099.
* lisp/vc/vc-git.el (vc-git-diff): Use "difftool -x diff" with
  `diff-switches' if `vc-git-diff-switches' is nil.

9 years agolisp/ido.el: New command `ido-bury-buffer-at-head'
Artur Malabarba [Wed, 19 Nov 2014 00:47:36 +0000 (00:47 +0000)]
lisp/ido.el: New command `ido-bury-buffer-at-head'

Bound to C-S-b
Bury the buffer at the head of `ido-matches', analogous to how C-k
kills the buffer at head.

9 years ago* lisp/simple.el (next-line-or-history-element): Wrap next-line in with-no-warnings.
Juri Linkov [Tue, 18 Nov 2014 22:23:47 +0000 (00:23 +0200)]
* lisp/simple.el (next-line-or-history-element): Wrap next-line in with-no-warnings.
(previous-line-or-history-element): Wrap previous-line in with-no-warnings.

9 years ago* lisp/progmodes/grep.el (grep-compute-defaults): Compute grep-highlight-matches...
Juri Linkov [Tue, 18 Nov 2014 22:05:09 +0000 (00:05 +0200)]
* lisp/progmodes/grep.el (grep-compute-defaults): Compute grep-highlight-matches before its use.

9 years ago* lisp/replace.el (query-replace-from-to-separator): Turn defvar into defcustom.
Juri Linkov [Tue, 18 Nov 2014 21:59:14 +0000 (23:59 +0200)]
* lisp/replace.el (query-replace-from-to-separator): Turn defvar into defcustom.
Wrap char-displayable-p in ignore-errors because an attempt
to autoload char-displayable-p fails during pre-loading.
Move (propertize "\0" ... 'separator t) out of customizable part
to query-replace-read-from.
(query-replace-read-from): Call custom-reevaluate-setting on
query-replace-from-to-separator to reevaluate the separator
depending on the return value of char-displayable-p.
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00466.html

9 years agoUse <up> and <down> keys to move point in the multi-line minibuffer.
Juri Linkov [Tue, 18 Nov 2014 21:33:42 +0000 (23:33 +0200)]
Use <up> and <down> keys to move point in the multi-line minibuffer.

* lisp/bindings.el (minibuffer-local-map): Rebind [down] from
next-history-element to next-line-or-history-element, and [up]
from previous-history-element to previous-line-or-history-element.

* lisp/simple.el (next-line-or-history-element)
(previous-line-or-history-element): New commands.

http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00822.html

9 years agolisp/ChangeLog: Fix bug#11386.
Rüdiger Sonderfeld [Tue, 18 Nov 2014 17:01:55 +0000 (18:01 +0100)]
lisp/ChangeLog: Fix bug#11386.

9 years agolisp/ChangeLog: add bug#13871.
Rüdiger Sonderfeld [Tue, 18 Nov 2014 16:55:21 +0000 (17:55 +0100)]
lisp/ChangeLog: add bug#13871.

There was a similar patch in bug#13871.

9 years agoNew macro define-advice
Leo Liu [Tue, 18 Nov 2014 15:57:01 +0000 (23:57 +0800)]
New macro define-advice

* doc/lispref/functions.texi (Advising Named Functions): Document
define-advice.

* lisp/emacs-lisp/nadvice.el (define-advice): New macro.
* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
define-advice.
(lisp-font-lock-keywords-1): Add define-advice.

9 years agoUse automatic variables in nt/Makefile.in
Glenn Morris [Tue, 18 Nov 2014 07:59:44 +0000 (23:59 -0800)]
Use automatic variables in nt/Makefile.in

* nt/Makefile.in (addpm${EXEEXT}, ddeclient${EXEEXT})
(cmdproxy${EXEEXT}, runemacs${EXEEXT}, emacs.res):
Use automatic variables.

9 years agoepg: Support key editing
Daiki Ueno [Tue, 18 Nov 2014 07:19:14 +0000 (16:19 +0900)]
epg: Support key editing

* epg.el (epg-context): New slot EDIT-CALLBACK.
(epg--process-filter): Call EDIT-CALLBACK when editing a key.
(epg-reset): Reset EDIT-CALLBACK of the context.
(epg-start-edit-key): New function.
(epg-edit-key): New function.

9 years agoPort new time stamp handling to Emacs 23.2.
Paul Eggert [Tue, 18 Nov 2014 06:44:27 +0000 (22:44 -0800)]
Port new time stamp handling to Emacs 23.2.

This fix is for Gnus.  Problem reported by Katsumi Yamaoka.
* calendar/time-date.el (time-add, time-subtract, time-less-p):
Use eval-and-compile, not eval-when-compile.

9 years agoepg: Fix callback argument type check
Daiki Ueno [Tue, 18 Nov 2014 05:52:45 +0000 (14:52 +0900)]
epg: Fix callback argument type check

* epg.el (epg-context-set-passphrase-callback)
(epg-context-set-progress-callback): Check if the CALLBACK
argument is a function, instead of a cons.

9 years agoepg: Simplify epa-pinentry-mode handling
Daiki Ueno [Tue, 18 Nov 2014 05:49:30 +0000 (14:49 +0900)]
epg: Simplify epa-pinentry-mode handling

* epa-file.el (epa-file-insert-file-contents)
(epa-file-write-region): Remove redundant check of
epa-pinentry-mode.
* epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region)
(epa-sign-region, epa-encrypt-region): Remove redundant check of
epa-pinentry-mode.

9 years agoepg: Don't show "*Error*" buffer when visiting a new file
Daiki Ueno [Tue, 18 Nov 2014 03:46:15 +0000 (12:46 +0900)]
epg: Don't show "*Error*" buffer when visiting a new file

* epa-file.el (epa-file-insert-file-contents): Don't show
"*Error*" buffer if input file does not exist.
Reported by Herbert J. Skuhra.

9 years agoprogmodes/cc-langs.el: Support some of the new keywords in C++11.
Paul Pogonyshev [Tue, 18 Nov 2014 02:34:01 +0000 (03:34 +0100)]
progmodes/cc-langs.el: Support some of the new keywords in C++11.

(c-operators): Add "alignof".
(c-primitive-type-kwds): Add "char16_t", "char32_t".
(c-type-modifier-kwds): Add "constexpr", "noexcept".
(c-modifier-kwds): Add "thread_local".
(c-constant-kwds): Add "nullptr".

Original patch by Paul Pogonyshev <pogonyshev@gmail.com> and updated
by Rüdiger Sonderfeld  <ruediger@c-plusplus.net>.

9 years agotildify.el: introduce a `tildify-foreach-region-function' variable
Michal Nazarewicz [Mon, 17 Nov 2014 13:41:37 +0000 (14:41 +0100)]
tildify.el: introduce a `tildify-foreach-region-function' variable

* textmodes/tildify.el (tildify-foreach-region-function): New
variable specifying a function determining portions of buffer that
should be tildified.  It allows major modes to create a filtering
function more elaborate than a set of regular expressions.
Initialised to `tildify--deprecated-ignore-evironments' by default
to handle now deprecated `tildify-ignored-environments-alist'
variable.
(tildify--foreach-region): A new function that takes
`tildify-foreach-region-function' into account and calls callback
for regions of the buffer that should be tildified.
(tildify-foreach-ignore-environments): A new function which can be
partially applied and used as `tildify-foreach-region-function'.
(tildify-ignored-environments-alist, tildify--pick-alist-entry):
Mark as obsolete.
(tildify--find-env): Rename from `tildify-find-env' and mark as
obsolete.
(tildify--deprecated-ignore-evironments): New function,
immediately marked as obsolete, used to handle deprecated
`tildify-ignored-environments-alist'.

* textmodes/tex-mode.el (tex-common-initialization): Set
`tildify-foreach-region-function' variable in all variants of TeX
mode since `tildify-ignored-environments-alist' variable is now
empty by default.

* nxml/nxml-mode.el (nxml-mode): Ditto in `nxml-mode'.

* textmodes/sgml-mode.el (sgml-mode): Ditto in `sgml-mode'.

9 years agotildify.el: introduce a `tildify-pattern' variable
Michal Nazarewicz [Sun, 16 Nov 2014 17:08:36 +0000 (18:08 +0100)]
tildify.el: introduce a `tildify-pattern' variable

* textmodes/tildify.el (tildify-pattern): New variable for
defining tildifying pattern.  Being a buffer-local variable it is
much easier to handle than `tildify-pattern-alist' that has been
used so far.  It also works better with derived modes.
(tildify-pattern-alist): Mark as obsolete.

9 years agotildify.el: introduce a `tildify-space-string' variable
Michal Nazarewicz [Sun, 16 Nov 2014 16:38:15 +0000 (17:38 +0100)]
tildify.el: introduce a `tildify-space-string' variable

* textmodes/tildify.el (tildify-space-string): New variable for
specifying representation of a hard space -- a no-break space by
default.  Being a buffer-local variable it is much easier to
handle than `tildify-string-alist' that has been used so far.  It
also works better with derived modes.
(tildify-string-alist): Mark as obsolete.

* textmodes/tex-mode.el (tex-common-initialization): Set
`tildify-space-string' variable in all variants of TeX mode since
`tildify-string-alist' is now empty by default.

* nxml/nxml-mode.el (nxml-mode): Ditto in `nxml-mode'.  If
encoding supports it use no-break space instead of character
entity; this changes previous default which used a numeric
reference.

* textmodes/sgml-mode.el (sgml-mode): ditto in `sgml-mode'.  If
encoding does not support no-break space, use numeric reference;
this changes previous default which used named entity (“&nbsp;”)
in HTML mode.

9 years agoFix bug#5433.
Ulf Jasper [Mon, 17 Nov 2014 20:17:06 +0000 (21:17 +0100)]
Fix bug#5433.

9 years agoMerge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Ulf Jasper [Mon, 17 Nov 2014 20:06:33 +0000 (21:06 +0100)]
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

9 years agoMerge branch 'uj-icalendar-bug#5433'
Ulf Jasper [Mon, 17 Nov 2014 20:00:24 +0000 (21:00 +0100)]
Merge branch 'uj-icalendar-bug#5433'

9 years agoNew option `icalendar-export-alarms'.
Ulf Jasper [Mon, 17 Nov 2014 19:51:26 +0000 (20:51 +0100)]
New option `icalendar-export-alarms'.

9 years ago* test/automated/occur-tests.el (occur-tests): Update for output change
Glenn Morris [Mon, 17 Nov 2014 18:55:02 +0000 (13:55 -0500)]
* test/automated/occur-tests.el (occur-tests): Update for output change
re control-chars.

9 years agoPeder Klingenberg has signed papers
Lars Magne Ingebrigtsen [Mon, 17 Nov 2014 18:47:18 +0000 (19:47 +0100)]
Peder Klingenberg has signed papers

9 years ago* lisp/bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.
Lars Magne Ingebrigtsen [Mon, 17 Nov 2014 18:46:51 +0000 (19:46 +0100)]
* lisp/bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.

9 years agoImprove output of occur-tests in case of failure
Glenn Morris [Mon, 17 Nov 2014 18:39:56 +0000 (13:39 -0500)]
Improve output of occur-tests in case of failure

* test/automated/occur-tests.el (occur-test-case, occur-test-create):
In case of failure, show the actual string, rather than just nil.

9 years agoicalendar: Add another test case for no-dst timezones.
Ulf Jasper [Mon, 17 Nov 2014 15:53:09 +0000 (16:53 +0100)]
icalendar: Add another test case for no-dst timezones.

9 years agointermediate commit
Ulf Jasper [Mon, 17 Nov 2014 15:44:52 +0000 (16:44 +0100)]
intermediate commit

9 years agolisp/gnus/message.el (message-valid-fqdn-regexp): Add non-internaional new TLDs
Albert Krewinkel [Mon, 17 Nov 2014 08:54:57 +0000 (17:54 +0900)]
lisp/gnus/message.el (message-valid-fqdn-regexp): Add non-internaional new TLDs

9 years agoPort new time stamp handling to old Emacs and to XEmacs.
Paul Eggert [Mon, 17 Nov 2014 07:37:19 +0000 (23:37 -0800)]
Port new time stamp handling to old Emacs and to XEmacs.

This is needed for Gnus, which copies time-date.el and which
runs on older Emacs implementations.
* calendar/time-date.el (with-decoded-time-value):
Handle 'nil' and floating-point arg more compatibly with new Emacs.
(encode-time-value, with-decoded-time-value):
Obsolete only if new Emacs.
(time-add, time-subtract, time-less-p): Define if not new Emacs.

9 years agoSpelling fixes.
Paul Eggert [Mon, 17 Nov 2014 06:26:17 +0000 (22:26 -0800)]
Spelling fixes.

9 years agoImprove time stamp handling, and be more consistent about it.
Paul Eggert [Mon, 17 Nov 2014 04:38:15 +0000 (20:38 -0800)]
Improve time stamp handling, and be more consistent about it.

This implements a suggestion made in:
http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00587.html
Among other things, this means timer.el no longer needs to
autoload the time-date module.
* doc/lispref/os.texi (Time of Day, Time Conversion, Time Parsing)
(Processor Run Time, Time Calculations):
Document the new behavior, plus be clearer about the old behavior.
(Idle Timers): Take advantage of new functionality.
* etc/NEWS: Document the changes.
* lisp/allout-widgets.el (allout-elapsed-time-seconds): Doc fix.
* lisp/arc-mode.el (archive-ar-summarize):
* lisp/calendar/time-date.el (seconds-to-time, days-to-time, time-since):
* lisp/emacs-lisp/timer.el (timer-relative-time, timer-event-handler)
(run-at-time, with-timeout-suspend, with-timeout-unsuspend):
* lisp/net/tramp.el (tramp-time-less-p, tramp-time-subtract):
* lisp/proced.el (proced-time-lessp):
* lisp/timezone.el (timezone-time-from-absolute):
* lisp/type-break.el (type-break-schedule, type-break-time-sum):
Simplify by using new functionality.
* lisp/calendar/cal-dst.el (calendar-next-time-zone-transition):
Do not return time values in obsolete and undocumented (HI . LO)
format; use (HI LO) instead.
* lisp/calendar/time-date.el (with-decoded-time-value):
Treat 'nil' as current time.  This is mostly for XEmacs.
(encode-time-value, with-decoded-time-value): Obsolete.
(time-add, time-subtract, time-less-p): Use no-op autoloads, for
XEmacs.  Define only if XEmacs, as they're now C builtins in Emacs.
* lisp/ldefs-boot.el: Update to match new time-date.el
* lisp/proced.el: Do not require time-date.
* src/editfns.c (invalid_time): New function.
Use it instead of 'error ("Invalid time specification")'.
(time_add, time_subtract, time_arith, Ftime_add, Ftime_less_p)
(decode_float_time, lisp_to_timespec, lisp_time_struct):
New functions.
(make_time_tail, make_time): Remove.  All uses changed to use
new functions or plain list4i.
(disassemble_lisp_time): Return effective length if successful.
Check that LOW is an integer, if it's combined with other components.
(decode_time_components): Decode into struct lisp_time, not
struct timespec, so that we can support a wide set of times
regardless of whether time_t is signed.  Decode plain numbers
as seconds since the Epoch, and nil as the current time.
(lisp_time_argument, lisp_seconds_argument, Ffloat_time):
Reimplement in terms of new functions.
(Fencode_time): Just use list2i.
(syms_of_editfns): Add time-add, time-subtract, time-less-p.
* src/keyboard.c (decode_timer): Don't allow the new formats (floating
point or nil) in timers.
* src/systime.h (LO_TIME_BITS): New constant.  Use it everywhere in
place of the magic number '16'.
(struct lisp_time): New type.
(decode_time_components): Use it.
(lisp_to_timespec): New decl.

9 years agoMake the eww buffers read-only
Lars Magne Ingebrigtsen [Sun, 16 Nov 2014 22:39:53 +0000 (23:39 +0100)]
Make the eww buffers read-only

Fixes: debbugs:16476
* net/eww.el (eww-mode): Make the buffer read-only.
(eww-form-text): Inhibit read-only-ness in text input fields
(bug#16476).

9 years agoImplement an `inhibit-read-only' text property
Lars Magne Ingebrigtsen [Sun, 16 Nov 2014 22:36:58 +0000 (23:36 +0100)]
Implement an `inhibit-read-only' text property

* doc/lispref/text.texi (Special Properties): Mention `inhibit-read-only'.

* src/buffer.c (Fbarf_if_buffer_read_only): Don't raise an error if
the text at POSITION (new optional argument) has the
`inhibit-read-only' text property set.

* src/callint.c (Fcall_interactively): Pass in nil as argument to
Fbarf_if_buffer_read_only.

* src/fileio.c (Finsert_file_contents): Ditto.

* src/insdel.c (prepare_to_modify_buffer_1): Pass start region in.

* src/intervals.h (INTERVAL_WRITABLE_P): Check the `inhibit-read-only'
text property.

* src/textprop.c (verify_interval_modification): Check buffer
readedness after the last interval.

9 years ago* lisp/simple.el (execute-extended-command--shorter): Cut search here.
Stefan Monnier [Sun, 16 Nov 2014 22:24:55 +0000 (17:24 -0500)]
* lisp/simple.el (execute-extended-command--shorter): Cut search here.
(execute-extended-command): Instead of here.

9 years ago* lisp/progmodes/python.el (python-mode): Avoid use of set-local to
Fabián Ezequiel Gallina [Sun, 16 Nov 2014 20:59:42 +0000 (17:59 -0300)]
* lisp/progmodes/python.el (python-mode): Avoid use of set-local to
keep Emacs 24.x compatibility.

9 years agoMove eww and shr to customization group `web'
Lars Magne Ingebrigtsen [Sun, 16 Nov 2014 20:29:40 +0000 (21:29 +0100)]
Move eww and shr to customization group `web'

* net/eww.el (eww): Ditto.

* net/shr.el (shr): Move to the new defgroup `web'.

9 years agoOnly show the "You can run" message if it's significantly shorter
Lars Magne Ingebrigtsen [Sun, 16 Nov 2014 19:37:51 +0000 (20:37 +0100)]
Only show the "You can run" message if it's significantly shorter

* simple.el (execute-extended-command): Don't show the help
message if the binding isn't significantly shorter than the
M-x command the user typed (bug#19013).

9 years agoalarm export, first step
Ulf Jasper [Sat, 15 Nov 2014 19:54:28 +0000 (20:54 +0100)]
alarm export, first step

9 years agointermediate commit
Ulf Jasper [Sat, 15 Nov 2014 12:49:28 +0000 (13:49 +0100)]
intermediate commit

9 years agoicalendar: fix issues regarding timezones without dst
Ulf Jasper [Sun, 16 Nov 2014 16:23:45 +0000 (17:23 +0100)]
icalendar: fix issues regarding timezones without dst

* lisp/calendar/icalendar.el (icalendar--convert-tz-offset): Return
complete cons when offsets of standard time and daylight saving
time are equal.
(icalendar-export-region): Fix unbound variable warning.

* test/automated/icalendar-tests.el (icalendar--parse-vtimezone): Add
testcase where offsets of standard time and daylight saving time
are equal.
(icalendar-real-world): Fix error in test case.  Expected result
was wrong when offsets of standard time and daylight saving time
were equal.

9 years agolisp/ChangeLog: removed duplicate entry
Oscar Fuentes [Sun, 16 Nov 2014 14:55:33 +0000 (15:55 +0100)]
lisp/ChangeLog: removed duplicate entry

9 years agoSet the push default to "current", which should work everywhere
Lars Magne Ingebrigtsen [Sun, 16 Nov 2014 14:54:12 +0000 (15:54 +0100)]
Set the push default to "current", which should work everywhere

9 years agoMention how to get rid of X11 warnings
Lars Magne Ingebrigtsen [Sun, 16 Nov 2014 14:31:20 +0000 (15:31 +0100)]
Mention how to get rid of X11 warnings

9 years agoFixes: debbugs:18596
Fabián Ezequiel Gallina [Sun, 16 Nov 2014 14:20:25 +0000 (11:20 -0300)]
Fixes: debbugs:18596
* lisp/progmodes/python.el (run-python): Allow CMD to be optional and
default it to a safe command, even for Windows.  (bug#18596)

9 years agoAdd faces for the VC modeline state indicator.
Óscar Fuentes [Sun, 16 Nov 2014 14:06:23 +0000 (15:06 +0100)]
Add faces for the VC modeline state indicator.

Fixes: debbugs:19043
Add faces for the VC modeline state indicator.
* lisp/vc/vc-hooks.el: (vc-state-faces, vc-state-base-face
vc-up-to-date-state, vc-needs-update-state, vc-locked-state)
vc-locally-added-state, vc-conflict-state, vc-removed-state,
vc-missing-state, vc-edited-state): New faces.
(vc-default-mode-line-string): Use them (bug#19043).

9 years ago* lisp/progmodes/python.el (python-shell-calculate-command): Rename
Fabián Ezequiel Gallina [Sun, 16 Nov 2014 13:47:14 +0000 (10:47 -0300)]
* lisp/progmodes/python.el (python-shell-calculate-command): Rename
from python-shell-parse-command.  Cleanup.
(run-python, run-python-internal): Use it.
(python-shell-calculate-pythonpath): Rename from
python-new-pythonpath.
(python-shell-calculate-process-environment): Use it.
(python-shell-calculate-exec-path): Add comment.

* test/automated/python-tests.el
(python-shell-calculate-process-environment-2): Fix test.
(python-shell-calculate-process-environment-1)
(python-shell-calculate-process-environment-3): Cleanup.

9 years agoFix ChangeLog typos.
Paul Eggert [Sun, 16 Nov 2014 07:22:34 +0000 (23:22 -0800)]
Fix ChangeLog typos.

9 years agoMerge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Jay Belanger [Sun, 16 Nov 2014 05:27:48 +0000 (23:27 -0600)]
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
lisp/ChangeLog

9 years ago2014-11-16 Thierry Banel <tbanelwebmin@free.fr> (tiny change)
Thierry Banel [Sun, 16 Nov 2014 05:24:25 +0000 (23:24 -0600)]
2014-11-16  Thierry Banel <tbanelwebmin@free.fr>  (tiny change)

* calc-arith.el (math-max-list, math-min-list): Fix bug
for date handling.

9 years agoResolve pull conflict
Stefan Monnier [Sun, 16 Nov 2014 05:23:39 +0000 (00:23 -0500)]
Resolve pull conflict

9 years agoMerge from emacs-24
Stefan Monnier [Sun, 16 Nov 2014 05:22:20 +0000 (00:22 -0500)]
Merge from emacs-24

9 years agoAdd faces for the VC modeline state indicator
Oscar Fuentes [Sun, 16 Nov 2014 04:40:10 +0000 (05:40 +0100)]
Add faces for the VC modeline state indicator

* lisp/vc/vc-hooks.el:
(vc-state-faces, vc-state-base-face)
(vc-up-to-date-state, vc-needs-update-state)
(vc-locked-state, vc-locally-added-state)
(vc-conflict-state, vc-removed-state)
(vc-missing-state, vc-edited-state):
New faces.
(vc-default-mode-line-string): Use them

9 years ago* lisp/emacs-lisp/backquote.el (backquote-process): Optimize away the ,' case.
Stefan Monnier [Sun, 16 Nov 2014 04:59:50 +0000 (23:59 -0500)]
* lisp/emacs-lisp/backquote.el (backquote-process): Optimize away the ,' case.

9 years agoDon't ignore .gitattributes
Andreas Schwab [Sat, 15 Nov 2014 23:49:38 +0000 (00:49 +0100)]
Don't ignore .gitattributes

Local attributes belong to .git/info/attributes.

9 years agoUse git rev-parse to get repository version
Andreas Schwab [Sat, 15 Nov 2014 22:48:47 +0000 (23:48 +0100)]
Use git rev-parse to get repository version

* version.el (emacs-repository-get-version): Use git rev-parse
instead of git log.

9 years agoBackport 2014-06-30 admin/update_autogen change
Glenn Morris [Sat, 15 Nov 2014 23:16:28 +0000 (18:16 -0500)]
Backport 2014-06-30 admin/update_autogen change

* admin/update_autogen: Auto-detect VCS in use.
(vcs): New variable.
(status, commit, main): Handle git.

9 years agoFixes: debbugs:18432
Fabián Ezequiel Gallina [Sat, 15 Nov 2014 22:02:52 +0000 (19:02 -0300)]
Fixes: debbugs:18432
* lisp/progmodes/python.el (python-indent-calculate-levels): Fix
indentation behavior multiline dedenter statement.

* test/automated/python-tests.el (python-indent-dedenters-8): New test
for Bug#18432.

9 years agoIgnore generated file lib/stdalign.h.
Christoph Scholtes [Sat, 15 Nov 2014 21:11:06 +0000 (14:11 -0700)]
Ignore generated file lib/stdalign.h.

9 years agoFix region indentation
Fabián Ezequiel Gallina [Sat, 15 Nov 2014 21:10:58 +0000 (18:10 -0300)]
Fix region indentation

Fixes: debbugs:18843
* lisp/progmodes/python.el (python-indent-region): Use
python-indent-line and skip special cases.

* test/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.

9 years ago* net/eww.el (eww-search-words): Mention `eww-search-prefix'.
Lars Magne Ingebrigtsen [Sat, 15 Nov 2014 20:18:58 +0000 (21:18 +0100)]
* net/eww.el (eww-search-words): Mention `eww-search-prefix'.

9 years agoEldoc setup code enhancements
Fabián Ezequiel Gallina [Sat, 15 Nov 2014 18:50:30 +0000 (15:50 -0300)]
Eldoc setup code enhancements

Fixes: debbugs:18962
* lisp/progmodes/python.el (python-eldoc-setup-code): Enhance string
type checks, simplify printing.

9 years agoUse cherry-pick -xe instead of git log amend
Lars Magne Ingebrigtsen [Sat, 15 Nov 2014 18:25:29 +0000 (19:25 +0100)]
Use cherry-pick -xe instead of git log amend

9 years agoBackport: Fix for 18993.
Jan D [Sat, 15 Nov 2014 18:20:37 +0000 (19:20 +0100)]
Backport: Fix for 18993.

* nsterm.m (ns_send_appdefined): Check for application defined
event on Cocoa (Bug#18993).  Backport from trunk.

9 years agoRedo the fix, the old takes too much CPU.
Jan D [Sat, 15 Nov 2014 18:09:58 +0000 (19:09 +0100)]
Redo the fix, the old takes too much CPU.

Fixes: 18993
* nsterm.m (ns_send_appdefined): Check for application defined
event on Cocoa (Bug#18993).
(run): Restore code before the previous 18993 fix.

9 years agoFix bug #19060 with inaccurate pixel-based scrolling.
Eli Zaretskii [Sat, 15 Nov 2014 17:04:17 +0000 (19:04 +0200)]
Fix bug #19060 with inaccurate pixel-based scrolling.

 src/window.c (window_scroll_pixel_based): Avoid truncation/rounding
 errors in computing the number of pixels to scroll.  Suggested by
 Kelly Dean <kelly@prtime.org>.

9 years agoFix cherry-pick conflict.
Michael Albinus [Sat, 15 Nov 2014 16:53:53 +0000 (17:53 +0100)]
Fix cherry-pick conflict.

9 years agoBackport: Fixes: debbugs:18940
Michael Albinus [Thu, 13 Nov 2014 15:26:51 +0000 (16:26 +0100)]
Backport: Fixes: debbugs:18940

* vc/vc-hg.el (vc-hg-state): Disable pager.

Conflicts:
lisp/ChangeLog

9 years agoAdd a draft of a very simple git workflow
Lars Magne Ingebrigtsen [Sat, 15 Nov 2014 16:06:34 +0000 (17:06 +0100)]
Add a draft of a very simple git workflow

9 years agoMark last change as "tiny"
Lars Magne Ingebrigtsen [Sat, 15 Nov 2014 15:25:55 +0000 (16:25 +0100)]
Mark last change as "tiny"

9 years ago(report-emacs-bug): Make a better guess at envelope-from
Peder O. Klingenberg [Sat, 15 Nov 2014 15:22:29 +0000 (16:22 +0100)]
(report-emacs-bug): Make a better guess at envelope-from

Fixes: debbugs:19054
* mail/emacsbug.el (report-emacs-bug): Make a better guess at
  envelope-from when reporting through sendmail.

9 years agoFix getting frame size wrong when restoring desktop.
Jan D [Sat, 15 Nov 2014 13:35:15 +0000 (14:35 +0100)]
Fix getting frame size wrong when restoring desktop.

* nsmenu.m (update_frame_tool_bar): If tool bar changes height,
call updateFrameSize.

9 years agoFixes: 18757
Jan D [Sat, 15 Nov 2014 12:39:30 +0000 (13:39 +0100)]
Fixes: 18757
* nsterm.m (setFrame:): Remove call to display (Bug#18757).

9 years agosrc/window.h (WINDOW_FRAME_LINE_HEIGHT): Fix a typo in a comment.
Eli Zaretskii [Sat, 15 Nov 2014 09:25:16 +0000 (11:25 +0200)]
src/window.h (WINDOW_FRAME_LINE_HEIGHT): Fix a typo in a comment.

 Reported by Kelly Dean <kelly@prtime.org>.

9 years ago.gitignore: Add lib-src/blessmail
Teemu Likonen [Sat, 15 Nov 2014 07:10:59 +0000 (09:10 +0200)]
.gitignore: Add lib-src/blessmail

9 years ago* .gitignore: Add a few more missing entries.
Stefan Monnier [Sat, 15 Nov 2014 05:44:14 +0000 (00:44 -0500)]
* .gitignore: Add a few more missing entries.

9 years agoBackport Use derived-mode-p in python.el instead of equality test with major-mode
Ivan Andrus [Sat, 1 Nov 2014 18:33:02 +0000 (12:33 -0600)]
Backport Use derived-mode-p in python.el instead of equality test with major-mode

Fixes: debbugs:18854
* progmodes/python.el (python-ffap-module-path): Use
`derived-mode-p' instead of equality test on `major-mode'.

9 years agoTime-out NS event loop
David Reitter [Fri, 14 Nov 2014 15:56:39 +0000 (10:56 -0500)]
Time-out NS event loop

OS X 10.10 will, at times, not send us the application-defined
event that is used to terminate the event loop.  As a workaround,
we define a timeout and react accordingly.  Leaving it in place
for other OSX and NS versions as a safety net.

Partial revert of 2014-11-08T16:32:37Z!jan.h.d@swipnet.se.

Fixes debbugs:18993

9 years agoUse derived-mode-p in python.el instead of equality test on major-mode
Ivan Andrus [Sat, 1 Nov 2014 18:33:02 +0000 (12:33 -0600)]
Use derived-mode-p in python.el 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'.