*** empty log message ***

5 files changed, 177 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 70e590e080f..c9e92f2c04c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1086,6 +1086,9 @@ Note that +++ before an item means the Lisp manual has been updated.
 When you add a new item, please add it without either +++ or ---
 so I will know I still need to look at it -- rms.
 
+** The functions base64-decode-region and base64-decode-string now
+signal an error instead of returning nil if decoding fails.
+
 ** The function sendmail-user-agent-compose now recognizes a `body'
 header is the list of headers passed to it.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b112a37c445..671f92599d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-03  Gerd Moellmann  <gerd@gnu.org>
 
+        * progmodes/compile.el (compile-internal): Display the compilation
+        buffer in a different frame, if it's already displayed there.
+
         * mail/rfc2368.el: New file.
 
         * simple.el (sendmail-user-agent-compose): Recognize a `body'
diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el
new file mode 100644
index 00000000000..368fcf405d1
--- /dev/null
+++ b/lisp/mail/rfc2368.el
@@ -0,0 +1,167 @@
+;;; rfc2368.el --- support for rfc2368
+
+;;; Copyright 1999 Sen Nagata <sen@eccosys.com>
+
+;; Author: Sen Nagata <sen_ml@eccosys.com>
+;; Keywords: mail
+
+;; Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; notes:
+;;
+;;   -repeat after me: "the colon is not part of the header name..."
+;;   -if w3 becomes part of emacs, then it may make sense to have this
+;;    file depend on w3 -- the maintainer of w3 says merging w/ Emacs
+;;    is planned!
+;;
+;; historical note:
+;;
+;;   this is intended as a replacement for mailto.el
+;;
+;; acknowledgements:
+;;
+;;   the functions that deal w/ unhexifying in this file were basically
+;; taken from w3 -- i hope to replace them w/ something else soon OR
+;; perhaps if w3 becomes a part of emacs soon, use the functions from w3.
+
+;;; History:
+;;
+;; 0.3:
+;;
+;;  added the constant rfc2368-version
+;;  implemented first potential fix for a bug in rfc2368-mailto-regexp
+;;  implemented first potential fix for a bug in rfc2368-parse-mailto
+;;  (both bugs reported by Kenichi OKADA)
+;;
+;; 0.2:
+;;
+;;  started to use checkdoc
+;;
+;; 0.1:
+;;
+;;  initial implementation
+
+;;; Code:
+
+;; only an approximation?
+;; see rfc 1738
+(defconst rfc2368-mailto-regexp
+  "^\\(mailto:\\)\\([^?]+\\)*\\(\\?\\(.*\\)\\)*"
+  "Regular expression to match and aid in parsing a mailto url.")
+
+;; describes 'mailto:'
+(defconst rfc2368-mailto-scheme-index 1
+  "Describes the 'mailto:' portion of the url.")
+;; i'm going to call this part the 'prequery'
+(defconst rfc2368-mailto-prequery-index 2
+  "Describes the portion of the url between 'mailto:' and '?'.")
+;; i'm going to call this part the 'query'
+(defconst rfc2368-mailto-query-index 4
+  "Describes the portion of the url after '?'.")
+
+;; for dealing w/ unhexifying strings, my preferred approach is to use
+;; a 'string-replace-match-using-function' which can perform a
+;; string-replace-match and compute the replacement text based on a
+;; passed function -- however, emacs doesn't seem to have such a
+;; function yet :-(
+
+;; for the moment a rip-off of url-unhex (w3/url.el)
+(defun rfc2368-unhexify-char (char)
+  "Unhexify CHAR -- e.g. %20 -> <SPC>."
+  (if (> char ?9)
+      (if (>= char ?a)
+          (+ 10 (- char ?a))
+        (+ 10 (- char ?A)))
+    (- char ?0)))
+
+;; for the moment a rip-off of url-unhex-string (w3/url.el) (slightly modified)
+(defun rfc2368-unhexify-string (string)
+  "Unhexify STRING -- e.g. 'hello%20there' -> 'hello there'."
+  (let ((case-fold-search t)
+        (result ""))
+    (while (string-match "%[0-9a-f][0-9a-f]" string)
+      (let* ((start (match-beginning 0))
+             (hex-code (+ (* 16
+                             (rfc2368-unhexify-char (elt string (+ start 1))))
+                          (rfc2368-unhexify-char (elt string (+ start 2))))))
+        (setq result (concat
+                      result (substring string 0 start)
+                      (char-to-string hex-code))
+              string (substring string (match-end 0)))))
+    ;; it seems clearer to do things this way than to just return:
+    ;; (concat result string)
+    (setq result (concat result string))
+    result))
+
+(defun rfc2368-parse-mailto-url (mailto-url)
+  "Parse MAILTO-URL, and return an alist of header-name, header-value pairs.
+MAILTO-URL should be a RFC 2368 (mailto) compliant url.  A cons cell w/ a
+key of 'Body' is a special case and is considered a header for this purpose.
+The returned alist is intended for use w/ the `compose-mail' interface.
+Note: make sure MAILTO-URL has been 'unhtmlized' (e.g. &amp; -> &), before
+calling this function."
+  (let ((case-fold-search t)
+        prequery query headers-alist)
+
+    (if (string-match rfc2368-mailto-regexp mailto-url)
+        (progn
+
+          (setq prequery
+                (match-string rfc2368-mailto-prequery-index mailto-url))
+          
+          (setq query
+                (match-string rfc2368-mailto-query-index mailto-url))
+
+          ;; build alist of header name-value pairs
+          (if (not (null query))
+              (setq headers-alist
+                    (mapcar
+                     (lambda (x)
+                       (let* ((temp-list (split-string x "="))
+                              (header-name (car temp-list))
+                              (header-value (cadr temp-list)))
+                         ;; return ("Header-Name" . "header-value")
+                         (cons
+                          (capitalize (rfc2368-unhexify-string header-name))
+                          (rfc2368-unhexify-string header-value))))
+                     (split-string query "&"))))
+
+          ;; deal w/ multiple 'To' recipients
+          (if prequery
+              (progn
+                (if (assoc "To" headers-alist)
+                    (let* ((our-cons-cell
+                            (assoc "To" headers-alist))
+                           (our-cdr
+                            (cdr our-cons-cell)))
+                      (setcdr our-cons-cell (concat our-cdr ", " prequery)))
+                  (setq headers-alist
+                        (cons (cons "To" prequery) headers-alist)))))
+          
+          headers-alist)
+      
+      (error "Failed to match a mailto: url"))
+    ))
+
+(provide 'rfc2368)
+
+;;; rfc2368.el ends here
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 23f31a7c4bf..eef616b8a79 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -465,7 +465,7 @@ active keymap.
 @defun define-prefix-command symbol &optional mapvar prompt
 @cindex prefix command
 This function prepares @var{symbol} for use as a prefix key's binding:
-it creates a full keymap and stores it as @var{symbol}'s function
+it creates a sparse keymap and stores it as @var{symbol}'s function
 definition.  Subsequently binding a key sequence to @var{symbol} will
 make that key sequence into a prefix key.  The return value is @code{symbol}.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 2f80f3e727d..498afe84959 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-03  Gerd Moellmann  <gerd@gnu.org>
 
+        * fns.c (Fbase64_decode_region, Fbase64_decode_string): Signal
+        an error if decoding fails.
+
         * keyboard.c (lispy_mouse_names): Variable removed.
         (Vlispy_mouse_stem): New variable.
         (syms_of_keyboard): Initialize Vlispy_mouse_stem.