procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
102419 commits 1 branch 0 tags 934 MiB
Commit graph

162 commits

Author SHA1 Message Date
Juanma Barranquero
0898ca10c0 Implement dynamic loading of GnuTLS on Windows. 
* lisp/term/w32-win.el (dynamic-library-alist): Add `gnutls'.

* nt/INSTALL: Clarify GnuTLS support.

* src/callproc.c, src/emacs.c: Include lisp.h before src/w32.h, not after.

* src/gnutls.c (Qgnutls_dll): Define.
  (DEF_GNUTLS_FN, LOAD_GNUTLS_FN): New macros.
  (gnutls_*): Declare function pointers.
  (init_gnutls_functions): New function to initialize function pointers.
  (emacs_gnutls_handshake, Fgnutls_error_string, Fgnutls_deinit)
  (emacs_gnutls_global_init, Fgnutls_bye): Use function pointers.
  (emacs_gnutls_record_check_pending, emacs_gnutls_transport_set_errno):
  Wrappers for gnutls_record_check_pending and gnutls_transport_set_errno.
  (emacs_gnutls_write, emacs_gnutls_read)
  (emacs_gnutls_handle_error, Fgnutls_error_fatalp)
  (Fgnutls_available_p): New function.
  (Fgnutls_boot): Call Fgnutls_available_p.  Use function pointers.
  (syms_of_gnutls) <Qgnutls_dll>: Initialize and staticpro it.
  (syms_of_gnutls) <Sgnutls_available_p>: defsubr it.

* src/gnutls.h (GNUTLS_EMACS_ERROR_NOT_LOADED): New macro.
  (emacs_gnutls_write, emacs_gnutls_read): Mark as extern.
  (emacs_gnutls_record_check_pending, emacs_gnutls_transport_set_errno):
  Declare.

* src/w32.c (QCloaded_from, Vlibrary_cache): Define.
  (w32_delayed_load): Move from image.c.  When loading a library, record
  its filename in the :loaded-from property of the library id.
  (globals_of_w32) <QCloaded_from, Vlibrary_cache>:
  Initialize and staticpro them.
  (emacs_gnutls_pull, emacs_gnutls_push): Call emacs_gnutls_* functions.

* src/image.c: Include w32.h.
  (Vimage_type_cache): Delete.
  (syms_of_image) <Vimage_type_cache>: Don't initialize and staticpro it.
  (CACHE_IMAGE_TYPE, Finit_image_library): Use Vlibrary_cache instead.
  (w32_delayed_load): Move to w32.c.

* src/process.c: Include lisp.h before src/w32.h, not after.
  (wait_reading_process_output): Call emacs_gnutls_record_check_pending
  instead of gnutls_record_check_pending.

* src/w32.h (VlibraryCache, QCloaded_from, w32_delayed_load): Declare.
 2011-05-04 16:03:16 +02:00
Glenn Morris
8d7b5b5ba9 * lisp/term/w32-win.el (libpng-version): Declare for compiler. 2011-02-02 23:31:42 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Chong Yidong
7c420169ba Merge changes from emacs-23 branch 2011-01-02 15:31:19 -05:00
Eli Zaretskii
5be1c984b7 Fix bug #7716 with PNG image support libraries on Windows. 
src/image.c <Qlibpng_version>: New variable.
 (syms_of_image): Intern and staticpro it.  Set its value to the
 version of PNG library we were compiled with.
 (my_png_error, png_load): Avoid GCC warnings about direct access
 to png_ptr->jmpbuf.
 lisp/term/w32-win.el (image-library-alist): Set up correctly for
 libpng versions both before and after 1.4.0.
 admin/nt/README.W32: Update the information about PNG support libraries.
 nt/INSTALL: Update the information about PNG support libraries.
 2010-12-31 14:38:06 +02:00
Glenn Morris
a44d921f06 Move some more shared x-, w32- things to common-win. 
* term/ns-win.el (x-select-text): Doc fix.
* w32-fns.el (x-alternatives-map, x-setup-function-keys)
(x-select-text): Move to term/common-win.
* term/w32-win.el (xw-defined-colors): Move to common-win.
* term/x-win.el (xw-defined-colors, x-alternatives-map)
(x-setup-function-keys, x-select-text): Move to common-win.
* term/common-win.el (x-select-text, x-alternatives-map)
(x-setup-function-keys, xw-defined-colors): Merge x- and w32-
definitions here.
 2010-10-24 15:04:45 -07:00
Juanma Barranquero
2e288d54f0 Rename image-library-alist' to dynamic-library-alist'. 
* etc/NEWS: Mention `dynamic-library-alist'.

* lisp/image.el (image-library-alist): Declare as obsolete alias.
  (image-type-available-p): Use `dynamic-library-alist'.

* lisp/term/w32-win.el (dynamic-library-alist):
  Use instead of `image-library-alist'.

* nt/INSTALL: Refer to `dynamic-library-alist'.

* src/image.c (Vimage_library_alist)
  (syms_of_image) <image-library-alist>: Move to src/emacs.c and rename.
  (lookup_image_type): Use Vdynamic_library_alist.
  (Finit_image_library): Doc fix.

* src/emacs.c (Vdynamic_library_alist)
  (syms_of_emacs) <dynamic-library-alist>: Move from src/image.c and rename.
  Doc fix.

* src/lisp.h (Vdynamic_library_alist): Declare extern.
 2010-10-13 16:50:06 +02:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Glenn Morris
b15c31c722 Remove unused declarations. 2009-10-01 02:17:38 +00:00
Stefan Monnier
9f94990d7e * term/x-win.el (x-initialize-window-system): 
* term/w32-win.el (w32-initialize-window-system):
* term/ns-win.el (ns-initialize-window-system): Don't call
mouse-wheel-mode since it's enabled globally by default already.
 2009-09-12 19:04:24 +00:00
Kenichi Handa
0311148f52 (w32-initialize-window-system): Call 
create-defualt-fontset, not setup-default-fontset.  Call
create-fontset-from-fontset-spec within condition-case.
 2009-03-19 00:57:20 +00:00
Jason Rumney
31358bee63 (w32-initialize-window-system): Don't override 
Japanese font settings.
(xlfd-regexp-registry-subnum): Remove unused declaration.
(w32-drag-n-drop-debug): Comment out unused debug function.
 2009-03-11 15:59:30 +00:00
Jason Rumney
4603334027 (w32-initialize-window-system): Don't override 
Japanese font settings.
 2009-03-11 15:15:09 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Jason Rumney
06d6d4bb6f (image-library-alist): Add gobject library. 2009-01-02 15:54:28 +00:00
Glenn Morris
a70f4c6f55 (x-select-font): Declare. 2008-11-19 04:33:00 +00:00
Glenn Morris
f2d9c15f59 Add declarations for builds without X. 2008-08-11 01:23:07 +00:00
Dan Nicolaescu
d5e4dda5f6 * term/x-win.el (x-handle-switch, x-handle-numeric-switch) 
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here.  New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
 2008-07-20 00:37:45 +00:00
Jason Rumney
aaa5e42077 (x-handle-switch, x-handle-name-switch) 
(x-handle-numeric-switch, x-handle-initial-switch)
(x-handle-xrm-switch, x-handle-args, x-handle-display)
(xw-defined-colors, w32-initialize-window-system):
Avoid use of cl pop and push macros.
 2008-07-14 10:30:56 +00:00
Jason Rumney
c652498926 (mouse-set-font): Remove overridden function. 
(w32-select-font): Declare as obsolete alias for x-select-font.
 2008-06-13 14:28:13 +00:00
Glenn Morris
aa360da10d Add some compiler declarations, for builds without X. 2008-06-12 03:56:20 +00:00
Jason Rumney
14f3467e1f * term/w32-win.el (w32-menu-bar-open): Rename from menu-bar-open. 
Use tmm-menubar if menu is disabled in this frame.

* menu-bar.el (menu-bar-open): Determine how to open menu bar
from frame type, per documentation. Add w32 case.
 2008-06-11 00:25:24 +00:00
Chong Yidong
2f8c51b55f Tweak last change. 2008-05-10 17:34:32 +00:00
Chong Yidong
3f2f222ab4 (x-colors): Re-order colors. 2008-05-10 17:28:09 +00:00
Glenn Morris
1fecc8feb6 Switch to recommended form of GPLv3 permissions notice. 2008-05-06 04:34:22 +00:00
Miles Bader
093571c374 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048
 2008-02-04 09:39:04 +00:00
Juanma Barranquero
299db7f8cf (image-library-alist): Prefer libpng12 to libpng13, because 
the latter is in fact a 1.2.8 build distributed with GTK+
(as of today, the most recent libpng is 1.2.24).
 2008-02-01 15:19:59 +00:00
Miles Bader
6498c4b170 Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-328
 2008-01-31 13:49:17 +00:00
Miles Bader
94cc397c54 Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1028
 2008-01-31 11:35:46 +00:00
Jason Rumney
72000816ad (image-library-alist): Prefer libxpm.dll. 2008-01-31 01:40:20 +00:00
Miles Bader
430d2ee291 Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
 2008-01-09 01:21:15 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
 2008-01-08 20:46:54 +00:00
Glenn Morris
12dc447f2a Add 2008 to copyright years. 2008-01-07 02:23:04 +00:00
Miles Bader
0bd5084171 Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
 2007-12-06 09:51:45 +00:00
Dan Nicolaescu
73e6adaa14 * international/titdic-cnv.el (dos-8+3-filename): 
* obsolete/fast-lock.el (msdos-long-file-names):
* frame.el (msdos-mouse-p):
* files.el (msdos-long-file-names, w32-long-file-name)
(msdos-long-file-names):
* term/mac-win.el (mac-code-convert-string, mac-coerce-ae-data)
(mac-resume-apple-event, mac-font-panel-mode)
(mac-atsu-font-face-attributes, mac-ae-set-reply-parameter)
(mac-clear-font-name-table):
* term/pc-win.el (msdos-remember-default-colors)
(w16-set-clipboard-data, w16-get-clipboard-data):
* term/w32-win.el (w32-send-sys-command, w32-select-font)
(set-message-beep):
* net/browse-url.el (w32-shell-execute):
* w32-fns.el (set-message-beep, w32-get-clipboard-data)
(w32-get-locale-info, w32-get-valid-locale-ids)
(w32-set-clipboard-data):
* dos-fns.el (int86, msdos-long-file-names):
* dos-w32.el (default-printer-name): Declare as functions.
 2007-11-22 01:05:55 +00:00
Dan Nicolaescu
99c715160b * frame.el (msdos-mouse-p): 
* files.el (msdos-long-file-names, w32-long-file-name)
(msdos-long-file-names):
* term/mac-win.el (mac-code-convert-string, mac-coerce-ae-data)
(mac-resume-apple-event, mac-font-panel-mode)
(mac-atsu-font-face-attributes, mac-ae-set-reply-parameter)
(mac-clear-font-name-table):
* term/pc-win.el (msdos-remember-default-colors)
(w16-set-clipboard-data, w16-get-clipboard-data):
* term/w32-win.el (w32-send-sys-command, w32-select-font)
(set-message-beep):
* net/browse-url.el (w32-shell-execute):
* dos-fns.el (int86, msdos-long-file-names):
* dos-w32.el (default-printer-name): Undo previous change.
 2007-11-21 08:37:31 +00:00
Jason Rumney
2101ea1a44 (x-setup-function-keys): Remove. 2007-11-21 03:41:27 +00:00
Dan Nicolaescu
e8ffb999b9 * frame.el (msdos-mouse-p): 
* generic-x.el (w32-shell-name):
* files.el (msdos-long-file-names, w32-long-file-name)
(msdos-long-file-names, dired-get-filename, dired-unmark)
(dired-do-flagged-delete, dos-8+3-filename, vms-read-directory)
(view-mode-disable):
* term/mac-win.el (mac-code-convert-string, mac-coerce-ae-data)
(mac-resume-apple-event, mac-font-panel-mode)
(mac-atsu-font-face-attributes, mac-ae-set-reply-parameter)
(mac-clear-font-name-table):
* term/pc-win.el (msdos-remember-default-colors)
(w16-set-clipboard-data, w16-get-clipboard-data):
* term/w32-win.el (w32-send-sys-command, w32-select-font)
(set-message-beep):
* w32-fns.el (set-message-beep, w32-get-clipboard-data)
(w32-get-locale-info, w32-get-valid-locale-ids)
(w32-set-clipboard-data):
* help-fns.el (ad-get-advice-info):
* font-lock.el (fast-lock-after-fontify-buffer)
(fast-lock-after-unfontify-buffer, fast-lock-mode)
(lazy-lock-after-fontify-buffer)
(lazy-lock-after-unfontify-buffer, lazy-lock-mode):
* net/browse-url.el (w32-shell-execute):
* dos-fns.el (int86, msdos-long-file-names):
* dos-w32.el (default-printer-name): Declare as functions.
 2007-11-21 03:06:01 +00:00
Jason Rumney
a49e5cc320 (x-setup-function-keys): Protect against 
multiple calls on the same terminal.
 2007-11-20 22:22:06 +00:00
Jason Rumney
70628e53b5 (w32-initialize-window-system): Use t, not nil to signify default fontset. 2007-11-17 02:40:11 +00:00
Miles Bader
f23d76bdef Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
 2007-11-11 00:56:44 +00:00
Jason Rumney
1adf362df7 (w32-initialize-window-system): Move SJIS font setup here from global scope. 2007-11-10 01:30:33 +00:00
Jason Rumney
756d09c83f Enable SJIS fonts before creating any fontsets. 2007-11-10 01:28:52 +00:00
Miles Bader
18cd1f1a08 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 902-908)

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

 * emacs--rel--22  (patch 131-137)

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

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
 2007-10-27 09:12:07 +00:00
Dan Nicolaescu
729f1525da * textmodes/reftex.el: Move require easymenu before first use. 
(reftex-info): Require info at compile too.

* textmodes/org-publish.el (org-publish-org-to-html)
(org-publish-org-to): Require org at compile time too.
(org-publish-attachment): Require at compile time too.

* term/tty-colors.el (w32-tty-standard-colors): Pacify
byte-compiler.

* term/pc-win.el (frame-creation-function-alist): Add to this
instead of setting frame-creation-function.

* play/blackbox.el (bb-up, bb-down): Use forward-line.

* net/rcirc.el (rcirc-markup-text-functions): Move definition
earlier.

* calendar/todo-mode.el: Require calendar at compile time.

* calendar/cal-islam.el: Require diary-lib at compile time.

* calendar/cal-hebrew.el: Require diary-lib and holidays at
compile time.

* w32-vars.el: Provide w32-vars.

* term/w32-win.el: Require w32-vars.
(w32-color-map): Pacify byte-compiler.

* loadup.el: Load w32-wars before term/w32-win.
 2007-10-21 00:24:32 +00:00
Jason Rumney
51da08c564 Don't require code-pages. 2007-10-14 23:08:39 +00:00
Miles Bader
985773c903 Fix up multi-tty merge 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-261
Creator:  Stefan Monnier <monnier@iro.umontreal.ca>
 2007-10-12 21:06:27 +00:00
Miles Bader
c73bd236f7 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
 2007-10-11 16:24:58 +00:00