1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-05 07:01:11 -08:00
Commit graph

100403 commits

Author SHA1 Message Date
Eli Zaretskii
fc6f18ceea Discovery of replacing display properties now uses the same code
as the display engine.  Tested OK with display properties whose
value is a list.

 src/dispextern.h (struct bidi_it): New member frame_window_p.
 (bidi_init_it, compute_display_string_pos): Update prototypes.
 src/bidi.c (bidi_fetch_char): Accept additional argument
 FRAME_WINDOW_P and pass it to compute_display_string_pos.  All
 callers changed.
 (bidi_init_it): Accept additional argument FRAME_WINDOW_P and use
 it to initialize the frame_window_p member of struct bidi_it.
 src/xdisp.c (handle_display_spec): New function, refactored from the
 last portion of handle_display_prop.
 (compute_display_string_pos): Accept additional argument
 FRAME_WINDOW_P.  Call handle_display_spec to determine whether the
 value of a `display' property is a "replacing spec".
 (handle_single_display_spec): Accept 2 additional arguments BUFPOS
 and FRAME_WINDOW_P.  If IT is NULL, don't set up the iterator from
 the display property, but just return a value indicating whether
 the display property will replace the characters it covers.
 (Fcurrent_bidi_paragraph_direction): Initialize the nchars and
 frame_window_p members of struct bidi_it.
2011-05-21 17:22:14 +03:00
Eli Zaretskii
683a44f77c Remove kludgey save and restore of IT->position for push_it.
src/xdisp.c (push_it): Accept second argument POSITION, where pop_it
 should jump to continue iteration.
2011-05-14 17:05:36 +03:00
Eli Zaretskii
7b60010279 Text covered by `display' overlays is correctly reordered.
Cursor positioning is not yet right near the overlay.

 src/xdisp.c (compute_display_string_pos): Non-trivial implementation.
 (compute_display_string_end): New function.
 src/dispextern.h (compute_display_string_end): Declare prototype.
 src/bidi.c (bidi_resolve_explicit_1): Use ZV for disp_pos.
 (bidi_fetch_char): Implement support for runs of characters
 covered by display strings.
2011-05-14 16:41:52 +03:00
Eli Zaretskii
102ebb0079 Refactoring with bidi_fetch_char tested and debugged.
src/bidi.c (bidi_fetch_char): Accept also character position
 corresponding to BYTEPOS.  All callers changed.
 (bidi_cache_iterator_state, bidi_resolve_explicit_1)
 (bidi_resolve_explicit, bidi_resolve_weak)
 (bidi_level_of_next_char, bidi_move_to_visually_next): Abort if
 bidi_it->nchars is non-positive.
 (bidi_level_of_next_char): Don't try to lookup the cache for the
 next/previous character if nothing is cached there yet, or if we
 were just reseat()'ed to a new position.
 (bidi_paragraph_init, bidi_resolve_explicit_1)
 (bidi_level_of_next_char): Fix arguments in the calls to
 bidi_fetch_char.
2011-05-14 14:59:20 +03:00
Eli Zaretskii
182ce2d254 Started work on reordering display strings. Refactor FETCH_CHAR.
Only compiled, not tested.

 src/xdisp.c (compute_display_string_pos): New function.
 (reseat_1): Initialize bidi_it.disp_pos.
 src/bidi.c (bidi_copy_it): Use offsetof.
 (bidi_fetch_char, bidi_fetch_char_advance): New functions.
 (bidi_cache_search, bidi_cache_iterator_state)
 (bidi_paragraph_init, bidi_resolve_explicit, bidi_resolve_weak)
 (bidi_level_of_next_char, bidi_move_to_visually_next): Support
 character positions inside a run of characters covered by a
 display string.
 (bidi_paragraph_init, bidi_resolve_explicit_1)
 (bidi_level_of_next_char): Call bidi_fetch_char and
 bidi_fetch_char_advance instead of FETCH_CHAR and
 FETCH_CHAR_ADVANCE.
 (bidi_init_it): Initialize new members.
 (LRE_CHAR, RLE_CHAR, PDF_CHAR, LRO_CHAR, RLO_CHAR): Remove macro
 definitions.
 (bidi_explicit_dir_char): Lookup character type in bidi_type_table,
 instead of using explicit *_CHAR codes.
 (bidi_resolve_explicit, bidi_resolve_weak): Use
 FETCH_MULTIBYTE_CHAR instead of FETCH_CHAR, as reordering of
 bidirectional text is supported only in multibyte buffers.
 src/dispextern.h (struct bidi_it): New members nchars and disp_pos.
 ch_len is now EMACS_INT.
 (compute_display_string_pos): Declare prototype.
2011-05-10 19:12:16 +03:00
Katsumi Yamaoka
ffb54e99ad gnus-art.el (gnus-article-mode): Move binding of shr-put-image-function here from gnus-article-prepare-display. 2011-05-10 07:30:49 +00:00
Katsumi Yamaoka
b9bdaf749f shr.el (shr-put-image-function): New variable.
(shr-image-fetched, shr-image-displayer, shr-tag-img): Funcall it.
 (shr-put-image): Return scaled image.
gnus-art.el (gnus-shr-put-image): New function.
 (gnus-article-prepare-display): Bind shr-put-image-function to it.
gnus-html.el (gnus-html-wash-images): Register scaled images, not original ones, as deletable.
2011-05-10 03:14:44 +00:00
Glenn Morris
b8f82dc15f Deprecate using "mode:" to enable minor modes (bug#8613)
* lisp/files.el (hack-one-local-variable-eval-safep):
Consider "eval: (foo-mode)" to be safe.

* doc/emacs/custom.texi (Specifying File Variables):
Deprecate using mode: for minor modes.

* etc/NEWS: Mention this.

* lisp/doc-view.el, lisp/net/soap-client.el:
Change "mode:" minor-mode file local variables to use "eval:".
2011-05-09 19:31:42 -07:00
Glenn Morris
4f99f44b34 diary-lib.el doc fixes.
* lisp/calendar/diary-lib.el (diary-list-entries-hook)
(diary-mark-entries-hook, diary-nongregorian-listing-hook)
(diary-nongregorian-marking-hook, diary-list-entries)
(diary-include-other-diary-files, diary-mark-entries)
(diary-mark-included-diary-files): Doc fixes.
2011-05-09 19:22:55 -07:00
Juanma Barranquero
84f29e6bd8 lisp/misc.el: Require tabulated-list.el during compilation. 2011-05-10 01:57:40 +02:00
Juri Linkov
c07b2710c7 * test/automated/occur-tests.el: Move from test/occur-testsuite.el.
Convert to ERT.
2011-05-10 03:21:32 +04:00
Teodor Zlatanov
81d7704c97 registry.el (registry-full): Add convenience method. Fix logic.
(registry-insert): Use it.  Fix logic here too.
gnus-registry.el (gnus-registry-insert): Add wrapper that calls `registry-prune' if `registry-full' returns t.
 (gnus-registry-handle-action, gnus-registry-get-or-make-entry, gnus-registry-set-id-key, gnus-registry-usage-test): Use it.
2011-05-09 22:27:17 +00:00
Chong Yidong
9bedd73a50 Call compilation-filter-hook in the no-async case too.
* progmodes/compile.el (compilation-start): Run
compilation-filter-hook for the async case too.
(compilation-filter-hook): Doc fix.
2011-05-09 15:42:45 -04:00
Stefan Monnier
68b5d5ee54 * lisp/gnus/nntp.el (nntp-open-connection): Set TCP keepalive option. 2011-05-09 16:41:14 -03:00
Deniz Dogan
797c735cc7 Add forgotten ChangeLog entry. 2011-05-09 19:50:47 +02:00
Deniz Dogan
1f14e9a61c * lisp/wdired.el: Remove outdated installation comment. Fix usage
comment.
2011-05-09 19:47:01 +02:00
Juanma Barranquero
5f4b1dfefa lisp/misc.el: Implement new command `list-dynamic-libraries'.
* misc.el (list-dynamic-libraries--loaded-only-p): New variable.
  (list-dynamic-libraries--refresh): New function.
  (list-dynamic-libraries): New command.
2011-05-09 17:52:57 +02:00
Eli Zaretskii
394970663d Define a replacement for va_copy for MSVC.
nt/config.nt [_MSC_VER] (va_copy): Replacement for the MS compiler.
2011-05-09 16:35:56 +03:00
Andreas Schwab
57679c8695 * w32menu.c (set_frame_menubar): Fix submenu allocation. 2011-05-09 13:29:51 +02:00
Ted Zlatanov
5a7f0a3050 * configure.in: Require GnuTLS 2.6.x or higher. 2011-05-09 05:40:26 -05:00
Chong Yidong
f104c116dc Fix last change. 2011-05-08 21:25:35 -04:00
Chong Yidong
3a648237a4 Doc fix to compilation.txt. 2011-05-08 21:24:57 -04:00
Chong Yidong
4c44026c14 Various fixes to compilation-error-regexp-alist-alist.
* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Fix
the ant regexp to handle end-line and end-column info from jikes.
Re-introduce maven regexp.  Give the ruby-Test::Unit regexp a
higher priority to avoid clobbering by gnu.
2011-05-08 21:24:00 -04:00
Chong Yidong
adec429a62 Add regression test for compilation-error-regexp-alist-alist.
* test/automated/compile-tests.el: New file.
2011-05-08 21:22:05 -04:00
Chong Yidong
c4c205d05a Convert test/comint-testsuite.el to ERT format. 2011-05-08 17:43:07 -04:00
Chong Yidong
027f966de4 Handle calling defface on a face with existing theme settings (Bug#8454).
* lisp/cus-face.el (custom-declare-face): Call custom-theme-recalc-face if
the face has existing theme settings.
2011-05-08 16:07:38 -04:00
Ralph Schleicher
2a86a00c4f Expand file names during browse-url-of-dired-file (Bug#8259).
* lisp/net/browse-url.el (browse-url-of-dired-file): Allow browsing of
special file names `.' and `..'.
2011-05-08 14:34:51 -04:00
Chong Yidong
085f5d7dca Handle "my" and "our" keywords in Perl imenu (Bug#8261).
* progmodes/perl-mode.el (perl-imenu-generic-expression): Only match
variables declared via `my' or `our'.
2011-05-08 14:23:11 -04:00
Chong Yidong
d9c54a06a0 Perform grep-mode's buffer modifications in a process filter (Bug#7952)
* progmodes/grep.el (grep-mode-font-lock-keywords): Remove
buffer-changing entries.
(grep-filter): New function.
(grep-mode): Add it to compilation-filter-hook.

* progmodes/compile.el (compilation-filter-hook)
(compilation-filter-start): New defvars.
(compilation-filter): Call compilation-filter-hook prior to
updating the process mark.
2011-05-08 01:17:17 -04:00
Stefan Monnier
c46626351c * lisp/emacs-lisp/eieio.el (defmethod): Fix typo in last change. 2011-05-07 23:33:28 -03:00
Eli Zaretskii
605c937661 Fix bug #8595 with setting mailclient-send-it on MS-Windows.
lisp/mail/sendmail.el (send-mail-function): On MS-Windows, default to
 mailclient-send-it even if window-system is nil.
2011-05-07 20:58:40 +03:00
Glenn Morris
89c41d686f Remove (tiny change) marker from author now with general assignment, 2011-05-07 10:39:44 -07:00
Eli Zaretskii
b0512a1d79 Fix bug #8597 with setting frame background mode on w32 console.
src/w32console.c (Fset_screen_color): Doc fix.
 (Fget_screen_color): New function.
 (syms_of_ntterm): Defsubr it.
 lisp/term/w32console.el (terminal-init-w32console): Call
 get-screen-color and use its output to set the frame
 background-mode.
2011-05-07 18:44:19 +03:00
Eli Zaretskii
0966ef96e7 Adapt the MS-DOS build to latest changes.
src/callproc.c (call_process_cleanup): Don't close and unlink the
 temporary file if Fcall_process didn't create it in the first
 place.
 (Fcall_process): Don't create tempfile if stdout of the child
 process will be redirected to a file specified with `:file'.
 Don't try to re-open tempfile in that case, and set fd[0] to -1 as
 cue to call_process_cleanup not to close that handle.
 msdos/inttypes.h: Include stdint.h.
 (uintmax_t): Don't define, it is defined in stdint.h.
 msdos/sedlibmk.inp (am__append_1): Edit to comment out.
 (am__append_2): Edit to expose.
 (NEXT_AS_FIRST_DIRECTIVE_STDARG_H, NEXT_STDARG_H, STDARG_H): Edit
 to empty.
 (@GL_GENERATE_STDARG_H_TRUE@, @GL_GENERATE_STDARG_H_FALSE@): Edit
 to comment out corresponding lines.
2011-05-07 14:28:55 +03:00
Eli Zaretskii
888c9e865f Fix changes in 2011-05-01T00:04:17Z!larsi@gnus.org for MS-DOS.
src/callproc.c (call_process_cleanup): Don't close and unlink the
 temporary file if Fcall_process didn't create it in the first
 place.
 (Fcall_process): Don't create tempfile if stdout of the child
 process will be redirected to a file specified with `:file'.
 Don't try to re-open tempfile in that case, and set fd[0] to -1 as
 cue to call_process_cleanup not to close that handle.
2011-05-07 14:25:05 +03:00
Julien Danjou
7ef1d63406 shr.el (shr-link): Make shr-link inherit from link by default. 2011-05-07 10:41:20 +00:00
Eli Zaretskii
75c0d28a6a Adapt MS-DOS configury to latest changes.
msdos/inttypes.h: Include stdint.h.
 (uintmax_t): Don't define, it is defined in stdint.h.
 msdos/sedlibmk.inp (am__append_1): Edit to comment out.
 (am__append_2): Edit to expose.
 (NEXT_AS_FIRST_DIRECTIVE_STDARG_H, NEXT_STDARG_H, STDARG_H): Edit
 to empty.
 (@GL_GENERATE_STDARG_H_TRUE@, @GL_GENERATE_STDARG_H_FALSE@): Edit
 to comment out corresponding lines.
2011-05-07 13:24:55 +03:00
Michael Albinus
58f74fe408 New default value of `ange-ftp-binary-file-name-regexp'. 2011-05-07 09:45:35 +02:00
Stefan Monnier
d1dc2cc2ce Make bytecomp.el understand that defmethod defines functions.
* lisp/emacs-lisp/eieio.el (eieio--defalias, eieio--defgeneric-init-form):
New functions.
(defgeneric, eieio--defmethod): Use them.
(eieio-defgeneric): Remove.
(defmethod): Call defgeneric in a way visible to the byte-compiler.

Fixes: debbugs:8631
2011-05-07 01:03:49 -03:00
Ben Key
4d3fcc8e60 * nt/configure.bat: Renamed the fusercflags variable to escusercflags
so that the variable name better matches its purpose, to be identical
to usercflags with the exception that all quotes are escaped by the \
character.

Renamed the fuserldflags variable to escuserldflags so that the
variable name better matches its purpose, to be identical to
userldflags with the exception that all quotes are escaped by the \
character.

A new ESC_USER_CFLAGS variable is written to config.settings.  This
variable has the same value as the escusercflags variable.

* nt/gmake.defs, nt/nmake.defs: Added the variable ESC_CFLAGS.  This
variable is identical to the CFLAGS variable except that it includes
the new ESC_USER_CFLAGS variable instead of USER_CFLAGS.

* src/makefile.w32-in: The bootstrap-temacs rule now makes use of one
of two shell specific rules, either bootstrap-temacs-CMD or
bootstrap-temacs-SH.  The bootstrap-temacs-SH rule is identical to the
previous implementation of the bootstrap-temacs rule.  The
bootstrap-temacs-CMD rule is similar to the previous implementation of
the bootstrap-temacs rule except that it makes use of the ESC_CFLAGS
variable instead of the CFLAGS variable.


These changes are required to extend my earlier fix to add support for
--cflags and --ldflags options that include quotes so that it works
whether make uses cmd or sh as the shell.
2011-05-06 23:00:12 -05:00
Glenn Morris
a3961c3e4d timeclock.el trivia.
* lisp/calendar/timeclock.el (timeclock-log-data): Remove unused local.
Use let rather than let*.
(timeclock-find-discrep): Remove unused local.
2011-05-06 18:24:04 -07:00
Glenn Morris
d306b4daa5 * doc/emacs/cal-xtra.texi (Sexp Diary Entries): Mention diary-hebrew-birthday. 2011-05-06 18:22:01 -07:00
Glenn Morris
314347b9ab * lisp/calendar/diary-lib.el (diary-comment-start): Doc fix. 2011-05-06 18:20:47 -07:00
Glenn Morris
915d130021 * lisp/calendar/appt.el (appt-time-msg-list): Doc fix. 2011-05-06 18:19:27 -07:00
Teodor Zlatanov
f8774e35f6 shr.el (shr-urlify, shr-link): Fix shr-link face. 2011-05-06 23:33:12 +00:00
Michael Albinus
b4289b644f * dbusbind.c (QCdbus_type_unix_fd): Declare static.
(xd_remove_watch): Don't check QCdbus_type_unix_fd for SYMBOLP, it
is a constant.
(Fdbus_init_bus, xd_read_queued_messages): Bus can be a symbol or
a string.  Handle both cases.
(Fdbus_call_method_asynchronously, Fdbus_register_signal)
(Fdbus_register_method): Use Qinvalid_function.
2011-05-07 00:12:31 +02:00
Noah Friedman
275b59b05d apropos.el (apropos-print-doc): Only use emacs-lisp-docstring-fill-column when it is bound to an integer, per that variable's documentation. 2011-05-06 12:59:17 -07:00
Stefan Monnier
6c19f744bb * lisp/lpr.el (print-region-1): Echo lpr-program's output, so error messages
and warnings are not silently discarded (e.g. use "-d" instead of "-P").
2011-05-06 13:38:02 -03:00
Juanma Barranquero
af4c0e2849 src/makefile.w32-in: Update dependencies. 2011-05-06 17:37:11 +02:00
Eli Zaretskii
0a47eac473 Adapt Windows include files to latest changes.
nt/inc/inttypes.h [!__MINGW32__]: Include stdint.h.  Move the
 definition of uintmax_t from here...
 nt/inc/stdint.h (uintmax_t): ...to here.
 (intptr_t) [!__GNUC__]: New typedef.
2011-05-06 15:09:08 +03:00