From 928ad6435e49441415684b375d4fa63aea280b0a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 24 Apr 2008 05:38:28 +0000 Subject: [PATCH 1/5] Adam Go biowski (tiny change) (etags${EXEEXT}, ctags${EXEEXT}): Fix quote typo. --- lib-src/ChangeLog | 4 ++++ lib-src/Makefile.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 63cc416cad7..2753a9db71c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2008-04-24 Adam Go,B3j(Bbiowski (tiny change) + + * Makefile.in (etags${EXEEXT}, ctags${EXEEXT}): Fix quote typo. + 2008-04-18 Steve Grubb (tiny change) * vcdiff: Use mktemp (CVE-2008-1694). diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index cb862625249..a4d85724384 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -416,7 +416,7 @@ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h ${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h - $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags + $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse @@ -424,7 +424,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h /* We depend on etags to assure that parallel makes don\'t write two etags.o files on top of each other. */ ctags${EXEEXT}: etags${EXEEXT} - $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags + $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile From 43392d1263d34c33a86eadf99783259bcf0e28f6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 25 Apr 2008 02:08:43 +0000 Subject: [PATCH 2/5] (diff-hunk-header-re-unified): Allow elided line counts. (diff-end-of-hunk, diff-unified->context, diff-fixup-modifs) (diff-sanity-check-hunk): Adjust code accordingly. --- lisp/ChangeLog | 6 ++++++ lisp/diff-mode.el | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2d01ec3ba0..5aaac0a545d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-04-25 Stefan Monnier + + * diff-mode.el (diff-hunk-header-re-unified): Allow elided line counts. + (diff-end-of-hunk, diff-unified->context, diff-fixup-modifs) + (diff-sanity-check-hunk): Adjust code accordingly. + 2008-04-23 YAMAMOTO Mitsuharu * term/mac-win.el (mac-ts-active-input-buf): Move defvar to macterm.c. diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 798f5f2e4ec..ecd8abae0bf 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -342,7 +342,7 @@ when editing big diffs)." (replace-match "" t t))))))) (defconst diff-hunk-header-re-unified - "^@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@") + "^@@ -\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? \\+\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)? @@") (defvar diff-font-lock-keywords `((,(concat "\\(" diff-hunk-header-re-unified "\\)\\(.*\\)$") @@ -402,8 +402,8 @@ See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html") (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context)))))) (goto-char (match-end 0)) (when (and (not donttrustheader) (match-end 2)) - (let* ((nold (string-to-number (match-string 2))) - (nnew (string-to-number (match-string 4))) + (let* ((nold (string-to-number (or (match-string 2) "1"))) + (nnew (string-to-number (or (match-string 4) "1"))) (endold (save-excursion (re-search-forward (if diff-valid-unified-empty-line @@ -768,9 +768,9 @@ else cover the whole buffer." (replace-match "***" t t nil 2)) ;; we matched a hunk header (let ((line1 (match-string 4)) - (lines1 (match-string 5)) + (lines1 (or (match-string 5) "1")) (line2 (match-string 6)) - (lines2 (match-string 7))) + (lines2 (or (match-string 7) "1"))) (replace-match (concat "***************\n*** " line1 "," (number-to-string (+ (string-to-number line1) @@ -1005,8 +1005,12 @@ else cover the whole buffer." (old2 (match-string 4)) (new1 (number-to-string (+ space minus))) (new2 (number-to-string (+ space plus)))) - (unless (string= new2 old2) (replace-match new2 t t nil 4)) - (unless (string= new1 old1) (replace-match new1 t t nil 2)))) + (if old2 + (unless (string= new2 old2) (replace-match new2 t t nil 4)) + (goto-char (match-end 4)) (insert "," new2)) + (if old1 + (unless (string= new1 old1) (replace-match new1 t t nil 2)) + (goto-char (match-end 2)) (insert "," new1)))) ((looking-at "--- \\([0-9]+\\),\\([0-9]*\\) ----$") (when (> (+ space bang plus) 0) (let* ((old1 (match-string 1)) @@ -1241,8 +1245,8 @@ Only works for unified diffs." ((eq (char-after) ?@) (if (not (looking-at diff-hunk-header-re-unified)) (error "Unrecognized unified diff hunk header format") - (let ((before (string-to-number (match-string 2))) - (after (string-to-number (match-string 4)))) + (let ((before (string-to-number (or (match-string 2) "1"))) + (after (string-to-number (or (match-string 4) "1")))) (forward-line) (while (case (char-after) From 5cc830c61ae301b4aaee79d170a7474ef5044bf3 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 25 Apr 2008 14:29:51 +0000 Subject: [PATCH 3/5] * m/sparc.h: Additional redefinitions for GNU/Linux. --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 456d03c07b3..94a8862ed10 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-04-25 Chip Coldwell + + * m/sparc.h: Additional redefinitions for GNU/Linux. + 2008-04-23 YAMAMOTO Mitsuharu * macterm.c (Vmac_ts_active_input_buf) [USE_MAC_TSM]: New variable. From 1bdbfed76bf9f3bb265cfdc21f624fb342944890 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 25 Apr 2008 14:30:41 +0000 Subject: [PATCH 4/5] Additional redefinitions for GNU/Linux. --- src/m/sparc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/m/sparc.h b/src/m/sparc.h index f4847676c3b..333d78863ad 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -93,6 +93,18 @@ NOTE-END */ #ifdef __arch64__ /* GCC, 64-bit ABI. */ #define BITS_PER_LONG 64 +#ifdef __linux__ +#undef START_FILES +#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o + +/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. + The reason is that some functions in libgcc.a call functions from libc.a, + and some libc.a functions need functions from libgcc.a. Since most + versions of ld are one-pass linkers, we need to mention -lgcc twice, + or else we risk getting unresolved externals. */ +#undef LIB_STANDARD +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o +#endif #ifndef _LP64 #define _LP64 /* Done on Alpha -- not sure if it should be here. -- fx */ From 96ebc53904c3e1a9f0b31f77c51586e60f546fd6 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sat, 26 Apr 2008 04:30:32 +0000 Subject: [PATCH 5/5] Merge from gnus--rel--5.10 Revision: emacs@sv.gnu.org/emacs--rel--22--patch-259 --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/mm-encode.el | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f0ba8af760e..d934d6c2c2e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2008-04-24 Luca Capello (tiny change) + + * mm-encode.el (mm-safer-encoding): Add optional argument `type'. + Don't use QP for message/rfc822. + (mm-content-transfer-encoding): Pass `type' to mm-safer-encoding. + 2008-04-13 Reiner Steib [Backport GNKSA related changes from the Gnus trunk.] diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el index d22c59c5018..3101b14d19e 100644 --- a/lisp/gnus/mm-encode.el +++ b/lisp/gnus/mm-encode.el @@ -96,14 +96,19 @@ This variable should never be set directly, but bound before a call to "application/octet-stream" (mailcap-extension-to-mime (match-string 0 file)))) -(defun mm-safer-encoding (encoding) +(defun mm-safer-encoding (encoding &optional type) "Return an encoding similar to ENCODING but safer than it." (cond ((eq encoding '7bit) '7bit) ;; 7bit is considered safe. - ((memq encoding '(8bit quoted-printable)) 'quoted-printable) + ((memq encoding '(8bit quoted-printable)) + ;; According to RFC2046, 5.2.1, RFC822 Subtype, "quoted-printable" is not + ;; a valid encoding for message/rfc822: + ;; No encoding other than "7bit", "8bit", or "binary" is permitted for the + ;; body of a "message/rfc822" entity. + (if (string= type "message/rfc822") '8bit 'quoted-printable)) ;; The remaining encodings are binary and base64 (and perhaps some ;; non-standard ones), which are both turned into base64. - (t 'base64))) + (t (if (string= type "message/rfc822") 'binary 'base64)))) (defun mm-encode-content-transfer-encoding (encoding &optional type) "Encode the current buffer with ENCODING for MIME type TYPE. @@ -178,7 +183,7 @@ The encoding used is returned." (mm-qp-or-base64) (cadr (car rules))))) (if mm-use-ultra-safe-encoding - (mm-safer-encoding encoding) + (mm-safer-encoding encoding type) encoding)))) (pop rules)))))