projects
/
elisp
/
riece.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed.
[elisp/riece.git]
/
lisp
/
server.rb
diff --git
a/lisp/server.rb
b/lisp/server.rb
index
05220b8
..
e18c527
100644
(file)
--- a/
lisp/server.rb
+++ b/
lisp/server.rb
@@
-19,8
+19,8
@@
# 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
# 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.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
require 'thread'
require 'stringio'
require 'thread'
require 'stringio'
@@
-103,7
+103,8
@@
class Server
Thread.current[:rubyserv_response] = eval(r, exec_env.empty_binding)
rescue Exception => e
Thread.current[:rubyserv_error] = true
Thread.current[:rubyserv_response] = eval(r, exec_env.empty_binding)
rescue Exception => e
Thread.current[:rubyserv_error] = true
- Thread.current[:rubyserv_response] = e.to_s.sub(/\A.*?\n/, '')
+ Thread.current[:rubyserv_response] =
+ e.to_s.sub(/\A.*?\n#{Regexp.quote(__FILE__)}:\d+: /o, '')
end
send_line("# exit #{name}\r\n")
end
end
send_line("# exit #{name}\r\n")
end
@@
-203,7
+204,7
@@
End
opts.on('-e', '--err ERRFILE', 'Send stderr to ERRFILE.') do |errfile|
opt_errfile = errfile
end
opts.on('-e', '--err ERRFILE', 'Send stderr to ERRFILE.') do |errfile|
opt_errfile = errfile
end
- opts.on('-l', '--log LOGFILE', 'Send stdlog to LOGFILE.') do |logfile|
+ opts.on('-l', '--log LOGFILE', 'Send log to LOGFILE.') do |logfile|
opt_logfile = logfile
end
opts.on_tail('--help', '-h', 'Show this message.') do
opt_logfile = logfile
end
opts.on_tail('--help', '-h', 'Show this message.') do