From 55586d2a88c1273958893da1e17979a3e7a89691 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 1 Oct 2010 01:05:26 +0200 Subject: [PATCH 1/2] * lisp/minibuffer.el (completion--replace): Better preserve markers. Fixes: debbugs:7138 --- lisp/ChangeLog | 9 +++++++-- lisp/minibuffer.el | 22 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22cc8f3a3ed..696941f93cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-30 Stefan Monnier + + * minibuffer.el (completion--replace): + Better preserve markers (bug#7138). + 2010-09-29 Juanma Barranquero * server.el (server-process-filter): Doc fix. @@ -10,8 +15,8 @@ * Makefile.in (ELCFILES): Update. - * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Avoid - infinite recursion on erroneous lambda form. (Bug#7114) + * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): + Avoid infinite recursion on erroneous lambda form. (Bug#7114) 2010-09-27 Kenichi Handa diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 93a222053f6..9a477020421 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -475,10 +475,30 @@ in the last `cdr'." (defun completion--replace (beg end newtext) "Replace the buffer text between BEG and END with NEWTEXT. Moves point to the end of the new text." - ;; This should be in subr.el. + ;; Maybe this should be in subr.el. ;; You'd think this is trivial to do, but details matter if you want ;; to keep markers "at the right place" and be robust in the face of ;; after-change-functions that may themselves modify the buffer. + (let ((prefix-len 0)) + ;; Don't touch markers in the shared prefix (if any). + (while (and (< prefix-len (length newtext)) + (< (+ beg prefix-len) end) + (eq (char-after (+ beg prefix-len)) + (aref newtext prefix-len))) + (setq prefix-len (1+ prefix-len))) + (unless (zerop prefix-len) + (setq beg (+ beg prefix-len)) + (setq newtext (substring newtext prefix-len)))) + (let ((suffix-len 0)) + ;; Don't touch markers in the shared suffix (if any). + (while (and (< suffix-len (length newtext)) + (< beg (- end suffix-len)) + (eq (char-before (- end suffix-len)) + (aref newtext (- (length newtext) suffix-len 1)))) + (setq suffix-len (1+ suffix-len))) + (unless (zerop suffix-len) + (setq end (- end suffix-len)) + (setq newtext (substring newtext 0 (- suffix-len))))) (goto-char beg) (insert newtext) (delete-region (point) (+ (point) (- end beg)))) From b336bfcdf39f1e4d35bff4a7bd01d3b4bca8f516 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 30 Sep 2010 20:41:12 -0700 Subject: [PATCH 2/2] Close bug#3992. * lib-src/emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back DARWIN_USER_TEMP_DIR. --- lib-src/ChangeLog | 5 +++++ lib-src/emacsclient.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 6b3584eb90f..11da74f63b0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2010-10-01 Glenn Morris + + * emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back + DARWIN_USER_TEMP_DIR. (Bug#3992) + 2010-05-07 Chong Yidong * Version 23.2 released. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 01241b518bb..05f01b3b097 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1249,7 +1249,18 @@ set_local_socket () { tmpdir = egetenv ("TMPDIR"); if (!tmpdir) - tmpdir = "/tmp"; + { +#ifdef DARWIN_OS + size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0); + if (n > 0) + { + tmpdir = alloca (n); + confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n); + } + else +#endif + tmpdir = "/tmp"; + } socket_name = alloca (strlen (tmpdir) + strlen (server_name) + EXTRA_SPACE); sprintf (socket_name, "%s/emacs%d/%s",