Permalink
Browse files

Revert "Merge branch 'feature/#349-buffer-string' into develop"

This reverts commit 5001dcb, reversing
changes made to fcb511f.

emacs.l でエラーになるので Revert
  • Loading branch information...
1 parent 5001dcb commit 190c773103f4357681c4f47b2d1ae868929f6620 @x022235 x022235 committed Aug 3, 2012
Showing with 0 additions and 54 deletions.
  1. +0 −1 etc/Lisp
  2. +0 −1 lisp/builtin.l
  3. +0 −27 reference/reference.xml
  4. +0 −1 src/gen-syms.cc
  5. +0 −7 src/insdel.cc
  6. +0 −17 unittest/insdel.l
View
@@ -104,7 +104,6 @@ buffer-stream-buffer
buffer-stream-p
buffer-stream-point
buffer-stream-set-point
-buffer-string
buffer-substring
bufferp
bury-buffer
View
@@ -754,7 +754,6 @@
(si::defun-builtin insert-file-contents (filename &optional visit-p offset size))
(si::defun-builtin insert (&rest string-or-char))
(si::defun-builtin delete-region (from to))
-(si::defun-builtin buffer-string (&optional buffer))
(si::defun-builtin buffer-substring (from to &optional buffer))
(si::defun-builtin copy-to-clipboard (string))
(si::defun-builtin get-clipboard-data ())
View
@@ -5690,32 +5690,6 @@ buffer-streamであるストリームの入出力のポイントを指定しま
</chapter>
<chapter>
-<title>buffer-string</title>
-<type>Function</type>
-<arguments>buffer-string &amp;optional BUFFER</arguments>
-<package>editor</package>
-<description>
-バッファの内容をすべて文字列として返します。
-
-narrow-to-region等でclipping制限がされている場合はclippingされた
-領域を返します。
-
- BUFFER : バッファを指定します。
- 指定がなければカレントバッファになります。
-
-この関数は以下の式と等価です。
-
- (buffer-substring (point-min) (point-max))
-
-補足:
- xyzzy 0.2.2.243 から利用可能です。
-</description>
-<seealso>buffer-substring</seealso>
-<section>文字列</section>
-<file>builtin.l</file>
-</chapter>
-
-<chapter>
<title>buffer-substring</title>
<type>Function</type>
<arguments>buffer-substring FROM TO &amp;optional BUFFER</arguments>
@@ -5731,7 +5705,6 @@ narrow-to-region等でclipping制限がされている場合はclippingされた
補足:
BUFFER 引数は xyzzy 0.2.2.243 から指定可能です。
</description>
-<seealso>buffer-string</seealso>
<seealso>substring</seealso>
<section>文字列</section>
<file>builtin.l</file>
View
@@ -1819,7 +1819,6 @@ static symbols ed[] =
DEFUN3 (insert-file-contents, 1, 3, 0),
DEFUN3 (insert, 0, 0, FFneed_rest),
DEFCMD3 (delete-region, 2, 0, 0, "*r"),
- DEFUN3 (buffer-string, 0, 1, 0),
DEFUN3 (buffer-substring, 2, 1, 0),
MAKE_SYMBOL2 (overwrite-mode),
DEFUN3 (copy-to-clipboard, 1, 0, 0),
View
@@ -1017,13 +1017,6 @@ Buffer::substring (point_t p1, point_t p2) const
}
lisp
-Fbuffer_string (lisp buffer)
-{
- Buffer *bp = Buffer::coerce_to_buffer (buffer);
- return bp->substring (bp->b_contents.p1, bp->b_contents.p2);
-}
-
-lisp
Fbuffer_substring (lisp p1, lisp p2, lisp buffer)
{
Buffer *bp = Buffer::coerce_to_buffer (buffer);
View
@@ -18,20 +18,3 @@
#1#))
=> #2=("fuga" "ug" "hoge" "og" "g")
=> #2#)
-
-(deftest test-buffer-string ()
- (with-temp-buffer
- (insert "hoge")
- (let ((b (selected-buffer)))
- (with-temp-buffer
- (insert "fuga")
- (list
- (buffer-string)
- (buffer-string nil)
- (buffer-string b)
- (buffer-string (buffer-name b))
- (save-restriction
- (narrow-to-region 1 3)
- (buffer-string))
- ))))
- => ("fuga" "fuga" "hoge" "hoge" "ug"))

0 comments on commit 190c773

Please sign in to comment.