Commit graph

305 commits

Author SHA1 Message Date
Dan Nicolaescu
636b507bcc * misc.texi (emacsclient Options): Describe what an empty string
argument does for --alternate-editor.

* emacsclient.1: Describe what an empty string argument does for
--alternate-editor.

* emacsclient.c (print_help_and_exit): Describe what an empty
string argument does for --alternate-editor.
(set_socket): Make it possible to not exit in case of an error.
(start_daemon_and_retry_set_socket): New function.
(main): Use it.  Restore the NULL value for socket_name and
server_file after the set_socket call.
2008-12-10 07:56:51 +00:00
Dan Nicolaescu
18d2ad2920 Fix typo in include. 2008-12-03 04:33:44 +00:00
Dan Nicolaescu
448d408588 Include <darpa/inet.h>. 2008-12-03 03:37:37 +00:00
Chong Yidong
a336ee5bc0 Fix last change. 2008-11-02 23:16:33 +00:00
Chong Yidong
273b902863 (window_system): Delete redundant variable.
(decode_options): Don't use it.
(find_tty): New function.
(main): Use find_tty, and don't use window_system.
2008-11-02 21:41:57 +00:00
Eli Zaretskii
d41784eef4 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
(w32_getenv): Treat $TERM specially: if not found in the environment and in
the Registry, return "w32console".
(ttyname) [WINDOWSNT]: New function.
2008-11-01 13:49:23 +00:00
Andreas Schwab
322ca65006 (main): Don't force sending tty when in eval mode. 2008-10-31 23:17:13 +00:00
Chong Yidong
8536c0f5c5 (main): If using the current frame, send tty information to Emacs in
case daemon mode needs to occupy this tty.
2008-10-30 15:54:38 +00:00
Juanma Barranquero
bc558f3edb * emacsclient.c (EXTRA_SPACE): New macro.
(get_server_config, set_local_socket): Use it.
2008-10-29 15:34:06 +00:00
Juanma Barranquero
f77b11a051 * server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp. 2008-10-29 10:42:31 +00:00
Dan Nicolaescu
dc1cd5f755 (longopts, print_help_and_exit): Add -nw.
(decode_options): Use getopt_long_only.
2008-10-13 02:32:51 +00:00
Eli Zaretskii
c966fd27a1 (main): Fix a typo in a comment. 2008-09-19 16:45:12 +00:00
Chong Yidong
d5dabcb513 (main): Use stdout rather than stdin to obtain the terminal (bug#427). 2008-09-19 15:50:24 +00:00
Dan Nicolaescu
7c2fb837ec * bitmaps/README:
* xfns.c:
* termcap.c:
* term.c:
* syswait.h:
* systty.h:
* systime.h:
* syssignal.h:
* sysdep.c:
* process.h:
* process.c:
* print.c:
* ndir.h:
* lread.c:
* keyboard.c:
* getpagesize.h:
* floatfns.c:
* fileio.c:
* emacs.c:
* doc.c:
* dispnew.c:
* dired.c:
* data.c:
* callproc.c:
* buffer.c:
* README:
* Makefile.in:
* s/template.h:
* s/msdos.h:
* m/vax.h: Remove VMS support.
* s/vms.h:
* vlimit.h:
* uaf.h:
* temacs.opt:
* param.h:
* ioctl.h: Remove file.

* descrip.mms:
* compile.com: Remove file.
* Create.c: Remove VMS support.

* message.el (Module):

* gnus-start.el (Module):

* gnus-registry.el (Module):

* textmodes/texinfmt.el:
* nxml/nxml-enc.el:
* mail/feedmail.el:
* international/mule.el:
* international/latexenc.el:
* emulation/viper-util.el:
* emulation/viper-init.el:
* emulation/viper-ex.el:
* emacs-lisp/bytecomp.el:
* version.el:
* subr.el:
* startup.el:
* sort.el:
* shadowfile.el:
* recentf.el:
* printing.el:
* paths.el:
* minibuffer.el:
* ls-lisp.el:
* loadup.el:
* hippie-exp.el:
* finder.el:
* files.el:
* ediff-util.el:
* ediff-ptch.el:
* ediff-init.el:
* ediff-diff.el:
* dired.el:
* dired-aux.el:
* cus-edit.el:
* bindings.el:
* arc-mode.el:
* add-log.el: Remove VMS support.
* obsolete/vmsproc.el:
* obsolete/vms-pmail.el:
* obsolete/vms-patch.el: Remove file.

* etags.c:
* emacsclient.c: Remove VMS support.

* termcap.src: Remove file.
* README:
* PROBLEMS:
* MACHINES: Remove VMS info.

* ediff.texi: Remove VMS support.

* os.texi:
* intro.texi:
* files.texi: Remove VMS support.

* emacs.texi: Remove VMS support.

* make-dist:
* README: Remove VMS support.
* vms: Remove directory.
2008-07-31 05:33:56 +00:00
Dan Nicolaescu
9e2a264775 Remove support for Mac Carbon.
* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon

* erc.el: Remove code for Carbon.

Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.

Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.

* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.

* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.

* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.

* xresources.texi: Remove mentions of Mac Carbon.

* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.

Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL:  Remove code for Carbon.
* configure: Regenerate.
2008-07-27 18:24:48 +00:00
Glenn Morris
294981c77c Switch to recommended form of GPLv3 permissions notice. 2008-05-09 23:19:13 +00:00
Dan Nicolaescu
9d2818d676 * configure.in: Remove references to obsolete variables and
systems.
* configure: Regenerate.

* Makefile.in (NO_SHORTNAMES):
* emacsclient.c (NO_SHORTNAMES):
* fakemail.c (NO_SHORTNAMES):
* make-docfile.c (NO_SHORTNAMES):
* movemail.c (NO_SHORTNAMES):
* pop.c (NO_SHORTNAMES): Remove references to obsolete variable.

* config.nt (SHORTNAMES): Remove reference to obsolete variable.

* s/vms4-0.h:
* s/vms4-2.h:
* s/vms4-4.h:
* s/vms5-5.h: Remove, unused.

* s/irix5-2.h:
* s/irix6-0.h:
* s/riscos5.h:
* s/mach-bsd4-3.h:
* m/mips4.h: Remove files for obsolete systems

* Makefile.in:
* filelock.c:
* unexmips.c:
* m/hp9000s300.h:
* m/iris4d.h:
* s/aix3-1.h:
* s/hpux.h:
* s/msdos.h:
* s/usg5-0.h:
* s/usg5-2-2.h:
* s/usg5-2.h:
* s/usg5-3.h: Remove references to obsolete variables.

* s/irix5-0.h: Remove, move all the contents ...
* s/irix6-5.h: ... here.  Simplify.
* config.in: Regenerate.
2008-02-24 18:53:07 +00:00
Juanma Barranquero
31e25350a8 Fix typo in comment. 2008-02-20 12:09:38 +00:00
Juanma Barranquero
50f271cb5a (main) [WINDOWSNT]: Understand DRIVE:NAME, where
NAME is relative to DRIVE'S current directory.
2008-02-20 12:06:52 +00:00
Juanma Barranquero
d07529f330 (print_help_and_exit): Show -d option on Windows. 2008-02-15 16:59:19 +00:00
Stefan Monnier
09317bf4bf (decode_options): Fix last change so as not to override an explicit -display. 2008-02-08 15:28:04 +00:00
Stefan Monnier
9997dc1529 (decode_options): Pass --display implicitly if -c
is specified.  Only set tty if -t or -c is specified.
2008-02-08 15:25:58 +00:00
Stefan Monnier
0ea5797a18 (decode_options): Default to a NULL display, as Emacs-22.
Allow the -d option under w32 again, for those rare cases where it
actually does make sense.
2008-01-26 21:27:38 +00:00
Juanma Barranquero
5ab7322861 (set_tcp_socket): Don't send a "\n" after the authentication string;
there's no need to haste.
2008-01-25 15:46:07 +00:00
Eli Zaretskii
0ebec7d35c (decode_options) [WINDOWSNT]: Don't use the value of DISPLAY in the
environment.  Don't support -d.
(print_help_and_exit) [WINDOWSNT]: Don't show the --display option.
(longopts) [WINDOWSNT]: Remove --display.
2008-01-12 15:50:33 +00:00
Glenn Morris
78da39c6e7 Add missing final newlines to message calls. 2008-01-09 04:40:14 +00:00
Glenn Morris
355a326e54 Daniel Hackney <dan at haxney.org> (tiny change)
(set_socket): Add trailing newline to socket error message.
2008-01-09 04:36:57 +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
a5b68355b3 Add 2008 to copyright years. 2008-01-07 08:42:46 +00:00
Juanma Barranquero
f387c1eec4 Comment change. 2007-10-27 13:38:28 +00:00
Miles Bader
fdc9061358 Merge from emacs--rel--22
Patches applied:

 * 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--devo--0--patch-908
2007-10-27 09:07:17 +00:00
Juanma Barranquero
7ce8671d69 Add a wrapper for getenv so it also checks the registry on Windows.
Suggestion and algorithm by Eli Zaretskii.
Code partially based on w32_get_resource and init_environment (w32.c).
(egetenv): New wrapper for getenv.
(get_current_dir_name, decode_options, get_server_config, set_local_socket,
set_socket, main): Use egetenv, not getenv.
(w32_get_resource, w32_getenv) [WINDOWSNT]: New functions.
2007-10-26 15:46:57 +00:00
Juanma Barranquero
70cd9104ca Add a wrapper for getenv so it also checks the registry on Windows.
Suggestion and algorithm by Eli Zaretskii.
Code partially based on w32_get_resource and init_environment (w32.c).
(xmalloc): New function by Károly Lőrentey (backported from the trunk).
(quote_file_name): Use it.
(egetenv): New wrapper for getenv.
(get_current_dir_name, decode_options, get_server_config, set_local_socket,
set_socket, main): Use egetenv, not getenv.
(w32_get_resource, w32_getenv) [WINDOWSNT]: New functions.
2007-10-26 15:39:49 +00:00
Jason Rumney
d22b00e516 (sock_err_message): New function.
(set_tcp_socket): Use it.
2007-10-25 23:56:53 +00:00
Juanma Barranquero
c4b858e380 (print_help_and_exit): Fix space to improve alignment in output messages. 2007-10-09 09:46:55 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
2007-10-09 08:52:57 +00:00
Jason Rumney
dbf60b0750 (w32_window_app): Init common controls when windowed. 2007-09-27 22:08:59 +00:00
Stefan Monnier
c1b8e8966d (decode_options): -t implies -c. 2007-09-21 03:21:54 +00:00
Stefan Monnier
cb06b8dcb5 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
(IS_ANY_SEP): Only define if !defined(HAVE_GET_CURRENT_DIR_NAME).
(main_argc): Remove.
(strprefix): Use strncmp.
2007-09-20 21:14:08 +00:00
Jason Rumney
c801ad51b2 (main) [SIGSTOP]: Change conditional from WINDOWSNT. 2007-09-20 14:58:41 +00:00
Stefan Monnier
31fa65956d (current_frame): Change the default.
(longopts): Replace --current-frame by --create-frame.
(decode_options): Reverse the meaning of -c.
(print_help_and_exit): Update help text accordingly.
(main): Remove the -version and -good-version messages.
2007-09-20 01:11:57 +00:00
Glenn Morris
29bda95905 (sys/stat.h, errno.h): Remove duplicate includes. 2007-08-26 00:56:36 +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
Glenn Morris
4a9f99bdfb Switch license to GPLv3 or later. 2007-07-25 05:08:27 +00:00
Dan Nicolaescu
30790a37ef * emacsclient.c (main): Avoid having a declaration after a
statement.

* sysdep.c: Comment out text after #endif.
2007-05-26 17:28:45 +00:00
Juanma Barranquero
c0f342ab43 (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
lost in the merge.
2007-05-21 12:15:52 +00:00
Dan Nicolaescu
caf49fb043 * loadup.el: Load mac-win on a Mac. Avoid loading both x-win and
mac-win.
* term/mac-win.el:
(mac-initialize-window-system): New function. Move global setup
here.

* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
(SYSTEM_PURESIZE_EXTRA): Only define on Carbon.

* emacsclient.c (decode_options): Don't use a tty on mac carbon.
2007-05-19 23:12:46 +00:00
Dan Nicolaescu
90843190c5 * emacsclient.c (handle_sigtstp): Use the new name for the
socket variable.
2007-05-17 00:17:06 +00:00
Dan Nicolaescu
1d00cfd429 * emacsclient.c (decode_options): Don't use a tty on windows.
* makefile.w32-in (VERSION): Update.
2007-05-16 23:16:53 +00:00
Jason Rumney
486ba65f34 (emacs_socket): Rename from s.
Move definition below includes it depends on.
(SEND_STRING, SEND_QUOTED): Remove obfuscation macros.
(quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp):
(main): Expand removed macros inline.
2007-05-16 21:35:06 +00:00