1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 14:10:47 -08:00
Commit graph

4733 commits

Author SHA1 Message Date
Glenn Morris
aa1459ae2a Fix up merged ChangeLog entries (dates, duplication, etc) 2014-11-29 13:25:50 -08:00
Paul Eggert
0cce3623b1 Merge branch 'emacs-24'. 2014-11-28 23:07:16 -08:00
Lars Magne Ingebrigtsen
2d431afee4 Add a DOM pretty-printing function
* doc/lispref/text.texi (Document Object Model): Mention `dom-pp'.

* lisp/dom.el (dom-pp): New function.
2014-11-27 16:57:22 +01:00
Ted Zlatanov
ba4502fe14 Merge branch 'emacs-24'
Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c
2014-11-26 21:31:11 -05:00
Lars Magne Ingebrigtsen
b67e8b793f * text.texi (Document Object Model): Typo fix 2014-11-26 20:47:01 +01:00
Lars Magne Ingebrigtsen
97d6e7e711 * text.texi (Document Object Model): New node to document dom.el. 2014-11-26 20:23:06 +01:00
Lars Magne Ingebrigtsen
cfe0d44ecb * misc.texi (Network Security): Use "untrustworthy" instead of "unsafe" 2014-11-25 16:34:55 +01:00
Paul Eggert
f24c8f98ec Fix white-space problems in ChangeLogs. 2014-11-24 17:16:27 -08:00
Eli Zaretskii
a6248f1390 doc/emacs/misc.texi (Network Security): Improve wording and indexing. 2014-11-24 20:07:51 +02:00
Lars Magne Ingebrigtsen
e22f5c07d8 Moved the Network Security Manager to the Emacs manual
* misc.texi (Gnus Summary Buffer): Moved the Network Security
Manager stuff here from the lispref manual.
2014-11-24 18:30:01 +01:00
Lars Magne Ingebrigtsen
f9bff82aa4 (Network Security): Mention more NSM variables. 2014-11-24 17:57:28 +01:00
Lars Magne Ingebrigtsen
7f311629f0 * processes.texi (Network Security): Made into its own section and fleshed out 2014-11-24 17:47:00 +01:00
Ivan Shmakov
e791d4dfb2 Document the eww Desktop stuff
Fixes: debbugs:18010

* eww.texi (Advanced): Mention the Desktop stuff (bug#18010).
2014-11-23 16:44:22 +01:00
Lars Magne Ingebrigtsen
b10d900663 Rename nsm-security-level' to network-security-level'
* net/nsm.el (network-security-level): Rename from
`nsm-security-level' and documented.
2014-11-23 15:13:13 +01:00
Lars Magne Ingebrigtsen
4c298b2a73 Implement a Network Security Manager
* processes.texi (Network): Mention the new :warn-unless-encrypted
parameter to `open-network-stream'.
(Network): Mention the Network Security Manager.

* net/nsm.el: New file that implements a Network Security Manager.

* net/network-stream.el (open-network-stream): Add a new
:warn-unless-encrypted parameter.
(network-stream-open-plain): Allow warning unless encrypted.
(network-stream-open-starttls): Call the Network Security Manager.
(network-stream-open-tls): Ditto.
2014-11-23 14:56:43 +01:00
Michael Albinus
600f3d0528 * tramp.texi (Remote processes): Let-bind environment variables to
`process-environment' when running `process-file' or `start-file-process'.
2014-11-23 12:33:45 +01:00
Ulf Jasper
c39443c1d6 '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.
2014-11-21 16:31:30 +01:00
Eli Zaretskii
1b351d4673 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>).
2014-11-21 11:32:53 +02:00
Eric S. Raymond
1e81f67690 Support for SRC in VC mode. 2014-11-20 17:57:22 -05:00
Paul Eggert
cd2e816cd3 Lessen focus on ChangeLog files, as opposed to change log entries.
This is in preparation for generating the former automatically
from the latter.
* admin/notes/bugtracker, admin/notes/copyright, admin/notes/newfile:
ChangeLog -> change log
* admin/notes/changelogs: Remove, merging old contents to ...
* admin/notes/repo: ... here.
* doc/emacs/maintaining.texi (Change Log): Mention that ChangeLog files may
be copied to or from a version control system.
* doc/emacs/trouble.texi (Sending Patches): Point to the commit messages.
* doc/lispref/intro.texi (Acknowledgments): ChangeLog file -> change log entries.
* doc/lispref/tips.texi (Library Headers): Emacs uses a version control system.
* etc/CONTRIBUTE: Give advice about git commit messages and how
to generate proposed patches containing them.
2014-11-19 11:37:56 -08:00
Ivan Shmakov
c2678a68dc * eww.texi (Basics): Document `eww-history-limit'. 2014-11-19 20:11:18 +01:00
Eli Zaretskii
2fa082c003 Fix VC documentation related to switching branches.
lisp/vc/vc.el (vc-retrieve-tag): Doc fix.

 doc/emacs/maintaining.texi (Switching Branches): Mention "C-x v r".
 Correct commands for switching branches in various VCSs.
2014-11-19 20:35:17 +02:00
Leo Liu
1148d37589 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.
2014-11-18 23:57:01 +08:00
Paul Eggert
342bc0e04b .gitignore cleanup.
* .gitignore: Merge contents of subsidiary files and organize the
result so as to avoid duplication.  Remove no-longer needed entries.
* admin/charsets/.gitignore, admin/unidata/.gitignore:
* doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
* leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
* lisp/calc/.gitignore, lisp/calendar/.gitignore:
* lisp/cedet/.gitignore, lisp/emulation/.gitignore:
* lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
* lisp/international/.gitignore, lisp/language/.gitignore:
* lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
* lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
* lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
* lisp/play/.gitignore, lisp/progmodes/.gitignore:
* lisp/term/.gitignore, lisp/textmodes/.gitignore:
* lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
Remove; no longer needed.
2014-11-17 17:58:28 -08:00
Paul Eggert
0921dbc3ab 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.
2014-11-16 20:41:22 -08:00
Paul Eggert
790c690572 Simplify and fix doc-related .gitignore files.
This fixes some unwanted 'git status' output after 'make docs'.
* .gitignore: Add **/Makefile, **/makefile.
Remove Makefile, makefile.
Add doc/*/*.xxx rules for the usual kinds of documentation outputs
and temporaries.  Add doc/misc/cc-mode.ss.
* doc/emacs/.gitignore, doc/lispref/.gitignore, doc/misc/.gitignore:
* lwlib/.gitignore, oldXMenu/.gitignore:
Remove, as these .gitignore files are no longer needed.
* doc/lispintro/.gitignore: Replace with list of exceptional PDF files.
2014-11-16 17:32:01 -08:00
Lars Magne Ingebrigtsen
d1b04a9e7a 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.
2014-11-16 23:41:55 +01:00
Tassilo Horn
202f4941dc Fix DocView slicing docs
* doc/emacs/misc.texi (DocView Slicing): Describe how to slice with the
mouse.  Fix command mentioned by slice by BoundingBox paragraph.
(Bug#18040)
2014-11-16 09:39:01 +01:00
Paul Eggert
dc7a3ba28b 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.
2014-11-14 12:25:11 -08:00
Paul Eggert
02073b2e84 Fix some 24-hour time stamps in documentation.
* doc/lispref/os.texi (Time of Day):
* doc/misc/org.texi (The date/time prompt, Matching tags and properties):
Use leading zero with 24-hour times less than 10:00.
2014-11-13 19:16:15 -08:00
Lars Magne Ingebrigtsen
790ad0171d Add a hook to be run after eww has rendered a page
* net/eww.el (eww-after-render-hook): New variable.
(eww-render): Use it.
2014-11-13 22:41:55 +01:00
Lars Magne Ingebrigtsen
f40090876c * eww.texi (Basics): Document `eww-readable'. 2014-11-10 21:37:17 +01:00
Katsumi Yamaoka
02ded86f07 doc/misc/ChangeLog: Fix date for 2014-08-13T13:14:43Z!kwhite@gnu.org 2014-11-10 09:30:26 +00:00
Tassilo Horn
7f829fafcc doc/misc/{gnus.texi,gnus-faq.texi}: Update docs wrt shr/html mail
* gnus.texi (HTML): Update section so that it mentions shr and w3m.
Also link the full EWW manual that explains more on shr, too.
* gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to
increase contrast when displaying HTML mail with shr.
2014-11-10 09:28:18 +00:00
Katsumi Yamaoka
155d93fff8 doc/misc/gnus.texi (Top): Add missing `HTML' menu.
(HTML): Fix xref to FAQ 4-16.
2014-11-10 02:17:47 +00:00
Glenn Morris
be1f31616a Further reduce the number of versioned files storing the version number
* 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.

* admin/admin.el (set-version): No need to update doc/man/emacs.1.

* doc/man/emacs.1.in: Rename from emacs.1.

* .bzrignore: Add doc/man/emacs.1.
2014-11-09 18:01:56 -08:00
Glenn Morris
d737aedbe8 * doc/emacs/Makefile.in (doc-emacsver): Tweak tempfile name. 2014-11-09 16:29:27 -08:00
Glenn Morris
a16d6f90ee Stop keeping doc/emacs/emacsver.texi in the repository
* configure.ac (doc/emacs/emacsver.texi): Generate it.

* make-dist (doc/emacs/emacsver.texi) [update]: No longer check it.

* doc/emacs/Makefile.in (top_srcdir, version): New, set by configure.
(doc-emacsver): New rule.
(bootstrap-clean, maintainer-clean): Delete emacsver.texi.
(emacsver.texi.in): Rename from emacsver.texi.

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

* .bzrignore: Add doc/emacs/emacsver.texi.
2014-11-09 16:17:17 -08:00
Juri Linkov
d3dba954b3 * lisp/isearch.el (isearch-message-prefix): Show "Multi-file" and
"Multi-buffer" instead of "Multi".

* lisp/misearch.el (multi-isearch-file-list): Autoload
multi-isearch-buffer-list and multi-isearch-file-list.
(multi-isearch-end): Reset multi-isearch-buffer-list and
multi-isearch-file-list to nil.

* doc/emacs/search.texi (Other Repeating Search): Add documentation for
multi-isearch-files and multi-isearch-files-regexp.

Fixes: debbugs:13592
2014-11-09 21:19:54 +02:00
Glenn Morris
da95e2399e Merge from emacs-24; up to 117691 2014-11-08 18:06:29 -08:00
Glenn Morris
e4ed201ff9 Replace doc/*/Makefile.in dist rules with code in admin/admin.el
* admin/admin.el (make-manuals-dist-output-variables)
(make-manuals-dist--1, make-manuals-dist): New.
Replaces doc/*/Makefile.in `dist' rules.

* doc/emacs/Makefile.in (version): Remove variable.
(clean): No longer delete dist tarfile.
(dist): Remove rule; replace with code in admin.el.

* doc/lispintro/Makefile.in (version): Remove variable.
(clean): No longer delete dist tarfile.
(dist): Remove rule; replace with code in admin.el.

* doc/lispref/Makefile.in (version): Remove variable.
(clean): No longer delete dist tarfile.
(dist): Remove rule; replace with code in admin.el.

* doc/misc/Makefile.in (version): Remove variable.
(clean): No longer delete dist tarfile.
(dist): Remove rule; replace with code in admin.el.
2014-11-08 18:02:51 -08:00
Glenn Morris
929201eab1 doc/misc/Makefile.in: Parallel make fix
* doc/misc/Makefile.in (${buildinfodir}/ccmode.info)
(${buildinfodir}/efaq%.info): Ensure output directory exists.
2014-11-08 11:12:38 -08:00
Glenn Morris
416148257a Merge from emacs-24; up to 117687 2014-11-08 10:21:38 -08:00
Michael Albinus
89be8b92a6 Backport Tramp changes from trunk.
* tramp.texi (Inline methods): Remove restriction on "telnet".
Recommend sharing ssh connections for "plink".
(External methods): Remove "sftp".  Merge "pscp" and "psftp"
descriptions.  Recommend sharing ssh connections.  Add "nc" method.
(GVFS based methods): Add "sftp".
(Customizing Completion, External packages, Issues): Use @dots{}.
(Remote shell setup): Explain, how to change command line
arguments of remote "nc" listener.

* trampver.texi: Update release number.
2014-11-08 10:07:24 +01:00
Katsumi Yamaoka
0565d1fb52 doc/misc/gnus.texi (HTML): Fix xref to EWW 2014-11-07 14:51:05 +00:00
Martin Rudalics
1c50b3adb6 Improve inhibiting of implied frame resizes.
* frames.texi (Size and Position): Rewrite description of
`frame-inhibit-implied-resize'.
* cus-start.el (frame-resize-pixelwise): Fix group.
(frame-inhibit-implied-resize): Add entry.
* dispnew.c (change_frame_size_1): Fix call of
adjust_frame_size.
* frame.c (Qsize, Qframe_position, Qframe_outer_size)
(Qframe_inner_size, Qexternal_border_size, Qtitle_height)
(Qmenu_bar_external, Qmenu_bar_size, Qtool_bar_external)
(Qtool_bar_size): New constants.
(frame_inhibit_resize, adjust_frame_size): New argument to
handle case where frame_inhibit_implied_resize is a list.
(Fmake_terminal_frame, Fset_frame_height, Fset_frame_width)
(Fset_frame_size, x_set_left_fringe, x_set_right_fringe)
(x_set_right_divider_width, x_set_bottom_divider_width)
(x_set_vertical_scroll_bars, x_set_horizontal_scroll_bars)
(x_set_scroll_bar_width, x_set_scroll_bar_height): Update
callers.
(frame-inhibit-implied-resize): Rewrite doc-string.
* frame.h (frame_inhibit_resize, adjust_frame_size): Fix
external declarations.
(Qframe_position, Qframe_outer_size)
(Qframe_inner_size, Qexternal_border_size, Qtitle_height)
(Qmenu_bar_external, Qmenu_bar_size, Qtool_bar_external)
(Qtool_bar_size): Extern them.
* gtkutil.c (FRAME_TOTAL_PIXEL_HEIGHT, FRAME_TOTAL_PIXEL_WIDTH)
(xg_height_or_width_changed): Remove.
(xg_frame_set_char_size): Adjust adjust_frame_size calls.
(menubar_map_cb, xg_update_frame_menubar, free_frame_menubar)
(tb_size_cb, update_frame_tool_bar, free_frame_tool_bar)
(xg_change_toolbar_position): Call adjust_frame_size directly.
* nsfns.m (x_set_internal_border_width, Fx_create_frame): Fix
calls of adjust_frame_size.
* w32fns.c (x_set_internal_border_width, x_set_menu_bar_lines)
(Fx_create_frame, x_create_tip_frame): Adjust adjust_frame_size
calls.
(x_set_tool_bar_lines, x_change_tool_bar_height): Make sure that
frame can get resized when tool-bar-lines parameter changes from
or to zero.
(Fw32_frame_menu_bar_size): Return fourth value.
(Fw32_frame_rect): Block input around system calls
(Fx_frame_geometry): New function.
* w32menu.c (set_frame_menubar): Adjust adjust_frame_size call.
* w32term.c (x_new_font): Adjust adjust_frame_size call.
* widget.c (EmacsFrameSetCharSize): Adjust frame_inhibit_resize
call.
* window.c (Fset_window_configuration): Adjust adjust_frame_size
call.
* xfns.c (x_set_menu_bar_lines, x_set_internal_border_width)
(Fx_create_frame): Adjust adjust_frame_size calls.
(x_set_tool_bar_lines, x_change_tool_bar_height): Make sure that
frame can get resized when tool-bar-lines parameter changes from
or to zero.
(Fx_frame_geometry): New function.
* xmenu.c (update_frame_menubar): On Lucid call
adjust_frame_size with one pixel less height to avoid that
repeatedly adding/removing the menu bar grows the frame.
(free_frame_menubar): On Motif arrange to optionally preserve
the old frame height when removing the menu bar.
* xterm.c (x_new_font): Adjust adjust_frame_size call.
2014-11-07 11:49:22 +01:00
Tassilo Horn
a067ef9a5d doc/misc/{gnus.texi,gnus-faq.texi}: Add link to EWW manual
* gnus.texi (HTML): Update section so that it mentions shr and w3m.
Also link the full EWW manual that explains more on shr, too.

* gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to
increase contrast when displaying HTML mail with shr.
2014-11-07 10:48:25 +00:00
Eli Zaretskii
cd4776ba26 doc/misc/eww.texi: Fix a typo and improve wording of last commit. 2014-11-07 10:59:00 +02:00
Tassilo Horn
9a51ab3848 Backport from trunk documentation of shr-color-visible-* variables.
doc/misc/eww.texi (Advanced): Document increasing contrast with
 shr-color-visible-distance-min and shr-color-visible-luminance-min.
2014-11-07 10:54:50 +02:00
Tassilo Horn
361ffe1324 Document how to increase contrast in EWW/shr
* doc/misc/eww.texi (Advanced): Document increasing contrast with
shr-color-visible-distance-min and
shr-color-visible-luminance-min.
2014-11-07 08:39:00 +01:00