Commit graph

129 commits

Author SHA1 Message Date
Miles Bader
e5e76c0431 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-943
2007-12-06 00:46:18 +00:00
Jason Rumney
44b1dc2e97 (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs. 2007-12-02 16:18:47 +00:00
Stefan Monnier
e047f44883 Rewrite abbrev.c in Elisp.
* image.c (Qcount): Don't declare as extern.
(syms_of_image): Initialize and staticpro `Qcount'.
* puresize.h (BASE_PURESIZE): Increase for the new abbrev.el functions.
* emacs.c (main): Don't call syms_of_abbrev.
* Makefile.in (obj): Remove abbrev.o.
(abbrev.o): Remove.
* abbrev.c: Remove.

Rewrite abbrev.c in Elisp.
* abbrev.el (abbrev-mode): Move custom group from cus-edit.el.
(abbrev-table-get, abbrev-table-put, abbrev-get)
(abbrev-put, make-abbrev-table, abbrev-table-p, clear-abbrev-table)
(define-abbrev, abbrev--check-chars, define-global-abbrev)
(define-mode-abbrev, abbrev--active-tables, abbrev-symbol)
(abbrev-expansion, abbrev--before-point, expand-abbrev)
(unexpand-abbrev, abbrev--write, abbrev--describe)
(insert-abbrev-table-description, define-abbrev-table):
New funs, largely transcribed from abbrev.c.
(abbrev-with-wrapper-hook): New macro.
(abbrev-table-name-list, global-abbrev-table)
(abbrev-minor-mode-table-alist, fundamental-mode-abbrev-table)
(abbrevs-changed, abbrev-all-caps, abbrev-start-location)
(abbrev-start-location-buffer, last-abbrev, last-abbrev-text)
(last-abbrev-location, pre-abbrev-expand-hook, abbrev-expand-function):
New vars, largely transcribed from abbrev.c.
* cus-edit.el (abbrev-mode): Remove.  Move to abbrev.el.
* cus-start.el: Remove abbrev-all-caps and pre-abbrev-expand-hook.
* loadup.el: Load "abbrev.el" before "lisp-mode.el".
2007-10-28 02:41:00 +00:00
Eli Zaretskii
1ea40aa2f3 Replace abs' with eabs'. 2007-10-13 12:48:57 +00:00
Miles Bader
5a1539f385 Add missing change from rel-22 branch to src/image.c
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-877
2007-10-09 10:28:47 +00:00
Richard M. Stallman
65342ae385 (free_bitmap_record): Renamed from Free_Bitmap_Record. 2007-10-09 01:40:05 +00:00
Juanma Barranquero
4024ec3a26 (syms_of_image) <image-types>: Fix typo in docstring. 2007-10-05 09:00:38 +00:00
Juanma Barranquero
bbe6f2aa11 (syms_of_image) <image-types>: Fix typo in docstring. 2007-10-04 16:57:53 +00:00
Richard M. Stallman
867a0d72ea (our_memory_buffer): Renamed from omfib_buffer. 2007-09-21 23:08:01 +00:00
Glenn Morris
aca946f32e (our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
2007-09-14 07:44:58 +00:00
Glenn Morris
a99dc82bd8 (our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
to omfib_buffer for clarity.
(gif_load) <interlace_start, interlace_increment>: Move to file scope.
2007-09-14 07:44:49 +00:00
Thien-Thi Nguyen
315912fb92 (gif_load): Fix bug: Handle nonexistent colormap. 2007-09-06 20:28:40 +00:00
Thien-Thi Nguyen
1ab2cd4392 (gif_load): Fix bug: Handle nonexistent colormap. 2007-09-06 20:25:18 +00:00
Glenn Morris
050b82f6f5 Comment. 2007-08-30 05:08:24 +00:00
Stefan Monnier
917ac1a9ba (png_load): Comment-out var only used in commented-out code. 2007-08-29 21:47:11 +00:00
Juanma Barranquero
747c316eac (syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes. 2007-08-28 11:39:26 +00:00
Miles Bader
62fb5e25f4 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 857-862)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.

 * emacs--rel--22  (patch 97-100)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
2007-08-27 09:21:49 +00:00
Juanma Barranquero
3046a84b5e (syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes. 2007-08-24 13:46:24 +00:00
Jason Rumney
5fc9fdeb31 [HAVE_NTGUI]: Define dynamic loaded functions.
(Qgdk_pixbuf, Qglib) [HAVE_NTGUI]: New symbols.
(syms_of_image) [HAVE_NTGUI]: Intern and staticpro them.
(init_svg_functions) [HAVE_NTGUI]: New function.
(fn_g_type_init, fn_g_object_unref, fn_g_error_free): New #defines.
(svg_load_image): Use them.
(svg_load_image) [HAVE_NTGUI]: Implement background.
2007-08-24 00:28:53 +00:00
YAMAMOTO Mitsuharu
c21e615131 (svg_load_image): Blend with specified background if exists.
Use IMAGE_BACKGROUND.  Add Mac OS Support.
2007-08-23 08:44:57 +00:00
Glenn Morris
6678dc115d (x_find_image_file): Search in etc/images/ rather than etc/. 2007-08-22 07:51:39 +00:00
Glenn Morris
4ab27a430b Paul Pogonyshev <pogonyshev at gmx.net>
Add support for SVG images.
Some additional comments by Joakim Verona <joakim@verona.se>.
2007-08-22 04:01:54 +00:00
Miles Bader
aaf34461ff Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
2007-08-13 13:51:08 +00:00
Chong Yidong
d725448fab Sync to trunk version.
(search_image_cache, uncache_image, image-refresh): New functions.
Check for fg and bg colors.
(lookup_image): Use search_image_cache.  Cache fg and bg colors.
(pbm_load): Another check for invalid image data.
(png_load): Ignore default background field.
2007-08-07 16:32:49 +00:00
Chong Yidong
8198352bca Minor cleanup. 2007-08-07 16:25:26 +00:00
Chong Yidong
465d8f275a (png_load): Ignore png-supplied background color. 2007-08-06 16:02:12 +00:00
Miles Bader
9899d01a0c Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-838)

   - Update from CVS
   - Merge from emacs--rel--22
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * emacs--rel--22  (patch 70-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
2007-07-31 05:50:45 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
684d6f5bcc Switch license to GPLv3 or later. 2007-07-25 05:19:07 +00:00
Miles Bader
7eb1e4534e Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 803-813)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 51-58)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 233-236)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
2007-07-15 02:05:20 +00:00
Jason Rumney
2386b1f188 (convert_mono_to_color_image): Swap fore and background. 2007-06-21 23:02:14 +00:00
Jason Rumney
bfe7f3fcfc (convert_mono_to_color_image): Swap fore and background. 2007-06-21 22:01:27 +00:00
Miles Bader
262d5ce7c2 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 793-802)

   - Update from CVS
   - Remove RCS keywords
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 42-50)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Gnus ChangeLog tweaks

 * gnus--rel--5.10  (patch 229-232)

   - Merge from emacs--devo--0, emacs--rel--22
   - ChangeLog tweak
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23
2007-06-16 22:33:42 +00:00
Chong Yidong
cf26ebe85b (search_image_cache): Remove unused variable. 2007-06-14 01:48:01 +00:00
YAMAMOTO Mitsuharu
c5b8e0eaed (lookup_image): Save frame foreground and background colors.
(search_image_cache): Check if saved and current frame colors match.
2007-06-13 08:22:12 +00:00
Miles Bader
67f3ad67ee Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 781-792)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
2007-06-11 01:00:07 +00:00
Chong Yidong
50fe226348 (xpm_load): Remove spurious call to xpm_init_color_cache. 2007-06-06 18:58:56 +00:00
Chong Yidong
6cf8ac625b (xpm_load): Remove spurious call to xpm_init_color_cache. 2007-06-06 18:57:12 +00:00
Chong Yidong
d3c35d1703 (search_image_cache): New function. Require background
color match if background color is unspecified in the image spec.
(uncache_image, lookup_image): Use it.
2007-06-03 00:23:33 +00:00
Miles Bader
34c6724464 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 771-780)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from emacs--rel--22, gnus--rel--5.10
   - Fix tq.el edge case

 * emacs--rel--22  (patch 26-32)

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

 * gnus--rel--5.10  (patch 224-225)

   - Merge from emacs--devo--0, emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-18
2007-05-30 14:44:47 +00:00
Chong Yidong
91be6b6665 (uncache_image): Fix typo. 2007-05-25 02:02:25 +00:00
Miles Bader
24236bd83e Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 762-764)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 22-23)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-15
2007-05-24 02:14:22 +00:00
Chong Yidong
483e7ae0fa (uncache_image): New function.
(Fimage_refresh): New function.
2007-05-21 23:03:49 +00:00
Miles Bader
7be1c21aed Merged from emacs--devo--0
Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-744
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-745
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-746
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-747
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-748
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-749
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-750
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-751
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-752
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-753
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-754
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-755
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-756
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-757
   Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change.

 * emacs@sv.gnu.org/emacs--devo--0--patch-758
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-759
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-760
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-761
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-14
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-15
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-16
   Update from CVS: src/xterm.c (XTread_socket): Revert last change.

 * emacs@sv.gnu.org/emacs--rel--22--patch-17
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-18
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-19
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-20
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-21
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-221
   Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-12
Creator:  Karoly Lorentey <karoly@lorentey.hu>
2007-05-20 23:29:14 +00:00
Chong Yidong
c295e710a2 (pbm_load): Check image size for monochrome pbm. 2007-05-14 14:53:15 +00:00
Chong Yidong
fb0b0862c6 (pbm_load): Correctly check image size for greyscale pbm. 2007-05-12 23:55:51 +00:00
Chong Yidong
d2dc1adfd0 (pbm_load): Correctly check image size for greyscale pbm. 2007-05-12 23:53:57 +00:00
Karoly Lorentey
e18c709364 Merged from emacs@sv.gnu.org
Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-660
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-661
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-662
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-663
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-664
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-665
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-666
   Fix read-only prompt problem in isearch

 * emacs@sv.gnu.org/emacs--devo--0--patch-667
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-668
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-669
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-670
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-671
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-672
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-673
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-206
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-207
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-208
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600
2007-04-22 12:12:29 +00:00
Chong Yidong
39e653ead8 (pbm_load): Signal error for invalid image size. 2007-03-18 23:09:57 +00:00
Karoly Lorentey
93afd0f1d4 Merged from emacs@sv.gnu.org
Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-599
   Merge from erc--main--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-600
   Merge from erc--main--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-601
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-602
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-603
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-604
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-605
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-606
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-607
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-608
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-609
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-610
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-611
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-612
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-613
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-614
   Make byte compiler correctly write circular constants

 * emacs@sv.gnu.org/emacs--devo--0--patch-615
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-616
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-617
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-618
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-192
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-193
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-194
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-195
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-196
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-594
2007-01-29 22:21:19 +00:00